diff --git a/libweston/compositor.c b/libweston/compositor.c
index 516be96b..9deb7817 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -2450,8 +2450,6 @@ weston_output_maybe_repaint(struct weston_output *output, struct timespec *now,
 	int ret = 0;
 	int64_t msec_to_repaint;
 
-	output->repainted = false;
-
 	/* We're not ready yet; come back to make a decision later. */
 	if (output->repaint_status != REPAINT_SCHEDULED)
 		return ret;
@@ -2563,6 +2561,9 @@ output_repaint_timer_handler(void *data)
 							    repaint_data);
 	}
 
+	wl_list_for_each(output, &compositor->output_list, link)
+		output->repainted = false;
+
 	output_repaint_timer_arm(compositor);
 
 	return 0;