diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
index d9f4ea999..0dc97cc36 100644
--- a/libweston/backend-drm/kms.c
+++ b/libweston/backend-drm/kms.c
@@ -1906,7 +1906,6 @@ atomic_flip_handler(int fd, unsigned int frame, unsigned int sec,
 	assert(crtc);
 
 	output = crtc->output;
-	output->page_flips_counted++;
 
 	/* During the initial modeset, we can disable CRTCs which we don't
 	 * actually handle during normal operation; this will give us events
@@ -1914,6 +1913,8 @@ atomic_flip_handler(int fd, unsigned int frame, unsigned int sec,
 	if (!output || !output->base.enabled)
 		return;
 
+	output->page_flips_counted++;
+
 	drm_output_update_msc(output, frame);
 
 	if (output->state_cur->tear) {