diff --git a/composite.cpp b/composite.cpp
index b867be5d79..f4d1e3d8ab 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -296,6 +296,7 @@ void Compositor::startupWithWorkspace()
         return;
     }
     Q_ASSERT(m_scene);
+    connect(workspace(), &Workspace::destroyed, this, [this] { compositeTimer.stop(); });
     claimCompositorSelection();
     m_xrrRefreshRate = KWin::currentRefreshRate();
     fpsInterval = options->maxFpsInterval();