diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
index 7adf9842d1..dd89310e47 100644
--- a/src/steamcompmgr.cpp
+++ b/src/steamcompmgr.cpp
@@ -838,6 +838,7 @@ struct commit_t : public gamescope::IWaitable
 			return false;
 
 		// Will automatically remove from epoll!
+		g_ImageWaiter.RemoveWaitable( this );
 		close( m_nCommitFence );
 		m_nCommitFence = -1;
 		return true;