diff --git a/libweston/compositor.c b/libweston/compositor.c
index 5ba909f4..3fa1b8d0 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -6719,9 +6719,12 @@ weston_output_disable(struct weston_output *output)
 	if (output->disable(output) < 0)
 		return;
 
-	if (output->enabled)
+	if (output->enabled) {
 		weston_compositor_remove_output(output);
 
+		assert(wl_list_empty(&output->paint_node_list));
+	}
+
 	output->destroying = 0;
 }
 
@@ -6816,8 +6819,6 @@ weston_output_release(struct weston_output *output)
 	if (output->enabled)
 		weston_compositor_remove_output(output);
 
-	assert(wl_list_empty(&output->paint_node_list));
-
 	pixman_region32_fini(&output->region);
 	wl_list_remove(&output->link);