diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index c7ad8f937..607eca2c3 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -440,6 +440,9 @@ static void begin_destroy(struct sway_output *output) {
 	output->wlr_output->data = NULL;
 	output->wlr_output = NULL;
 
+	wl_event_source_remove(output->repaint_timer);
+	output->repaint_timer = NULL;
+
 	request_modeset();
 }
 
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 44b941ca2..65d9e3e71 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -273,7 +273,6 @@ void output_destroy(struct sway_output *output) {
 	destroy_scene_layers(output);
 	list_free(output->workspaces);
 	list_free(output->current.workspaces);
-	wl_event_source_remove(output->repaint_timer);
 	wlr_color_transform_unref(output->color_transform);
 	free(output);
 }