diff --git a/src/xwayland/xwm.rs b/src/xwayland/xwm.rs
index fec714d6..5c43304d 100644
--- a/src/xwayland/xwm.rs
+++ b/src/xwayland/xwm.rs
@@ -1882,6 +1882,7 @@ impl Wm {
         };
         // log::info!("xwm destroy_notify {}", event.window);
         data.destroyed.set(true);
+        data.stack_link.borrow_mut().take();
         if let Some(sid) = data.surface_id.take() {
             self.windows_by_surface_id.remove(&sid);
         }