diff --git a/composite.h b/composite.h
--- a/composite.h
+++ b/composite.h
@@ -188,7 +188,6 @@
     void startupWithWorkspace();
     void setupX11Support();
 
-    void setCompositeTimer();
     void performCompositing();
     bool windowRepaintsPending() const;
 
diff --git a/composite.cpp b/composite.cpp
--- a/composite.cpp
+++ b/composite.cpp
@@ -366,12 +366,6 @@
     performCompositing();
 }
 
-void Compositor::scheduleRepaint()
-{
-    if (!compositeTimer.isActive())
-        setCompositeTimer();
-}
-
 void Compositor::stop()
 {
     if (m_state == State::Off || m_state == State::Stopping) {
@@ -580,32 +574,24 @@
 
 void Compositor::addRepaint(int x, int y, int w, int h)
 {
-    if (!hasScene())
-        return;
     repaints_region += QRegion(x, y, w, h);
     scheduleRepaint();
 }
 
 void Compositor::addRepaint(const QRect& r)
 {
-    if (!hasScene())
-        return;
     repaints_region += r;
     scheduleRepaint();
 }
 
 void Compositor::addRepaint(const QRegion& r)
 {
-    if (!hasScene())
-        return;
     repaints_region += r;
     scheduleRepaint();
 }
 
 void Compositor::addRepaintFull()
 {
-    if (!hasScene())
-        return;
     const QSize &s = screens()->size();
     repaints_region = QRegion(0, 0, s.width(), s.height());
     scheduleRepaint();
@@ -804,9 +790,9 @@
     return false;
 }
 
-void Compositor::setCompositeTimer()
+void Compositor::scheduleRepaint()
 {
-    if (m_state != State::On) {
+    if (m_state != State::On || compositeTimer.isActive()) {
         return;
     }