diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
index ed44655..88eccb9 100644
--- a/src/steamcompmgr.cpp
+++ b/src/steamcompmgr.cpp
@@ -2789,9 +2789,12 @@ finish_destroy_win(Display *dpy, Window id, bool gone)
 				w->damage = None;
 			}
 
-			// release all commits now we are closed.
-			for ( commit_t& commit : w->commit_queue )
-				release_commit( commit );
+			if (gone)
+			{
+				// release all commits now we are closed.
+				for ( commit_t& commit : w->commit_queue )
+					release_commit( commit );
+			}
 
 			wlserver_lock();
 			wlserver_surface_finish( &w->surface );