diff --git a/composite.cpp b/composite.cpp
index 58f78564e0..328f5aaf6d 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -772,7 +772,7 @@ void Compositor::setCompositeTimer()
 {
     if (!hasScene())  // should not really happen, but there may be e.g. some damage events still pending
         return;
-    if (!Workspace::self()) {
+    if (m_starting || !Workspace::self()) {
         return;
     }