diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 1f5b73d9..0a19ad57 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -657,6 +657,10 @@ static void output_manager_apply(struct sway_server *server,
 done:
 	if (ok) {
 		wlr_output_configuration_v1_send_succeeded(cfg);
+		if (server->delayed_modeset != NULL) {
+			wl_event_source_remove(server->delayed_modeset);
+			server->delayed_modeset = NULL;
+		}
 	} else {
 		wlr_output_configuration_v1_send_failed(cfg);
 	}