diff --git a/data/gala.metainfo.xml.in b/data/gala.metainfo.xml.in
index 2b499ab82..561fed017 100644
--- a/data/gala.metainfo.xml.in
+++ b/data/gala.metainfo.xml.in
@@ -27,6 +27,18 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="8.2.4" date="2025-06-12" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+          <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/gala/issues/2438">Gala randomly segfaults while closing Libreoffice windows</issue>
+      </issues>
+    </release>
+
     <release version="8.2.3" date="2025-05-20" urgency="medium">
       <description>
         <p>Improvements:</p>
diff --git a/src/WindowStateSaver.vala b/src/WindowStateSaver.vala
index 2f0ed020c..2c0fb2f05 100644
--- a/src/WindowStateSaver.vala
+++ b/src/WindowStateSaver.vala
@@ -147,7 +147,10 @@ public class Gala.WindowStateSaver : GLib.Object {
         var app_id = GLib.Markup.escape_text (window_tracker.get_app_for_window (window).id);
 
         var window_index = find_window_index (window, app_id);
-        app_windows[app_id].remove_index (window_index);
+        if (window_index < app_windows[app_id].length) {
+            app_windows[app_id].remove_index (window_index);
+        }
+
         var value = null; // insert_val requires lvalue
         app_windows[app_id].insert_val (window_index, value);