diff --git a/src/core/frame.c b/src/core/frame.c
index 9c8cbb946..f995ca2c3 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -194,9 +194,12 @@ meta_window_destroy_frame (MetaWindow *window)
 
   if (!x11_display->closing)
     {
-      meta_stack_tracker_record_add (window->display->stack_tracker,
-                                     window->xwindow,
-                                     XNextRequest (x11_display->xdisplay));
+      if (!window->unmanaging)
+        {
+          meta_stack_tracker_record_add (window->display->stack_tracker,
+                                         window->xwindow,
+                                         XNextRequest (x11_display->xdisplay));
+        }
 
       XReparentWindow (x11_display->xdisplay,
                        window->xwindow,