diff --git a/compositor/compositor.c b/compositor/compositor.c
index c1765b40..17930cb0 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -997,10 +997,10 @@ wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
 		output->pending_scanout_buffer = NULL;
 	}
 
-	output->repaint_scheduled = 0;
-
 	if (output->repaint_needed)
 		repaint(output, msecs);
+	else
+		output->repaint_scheduled = 0;
 }
 
 WL_EXPORT void