diff --git a/src/output.c b/src/output.c
index 20f7c916..12ef53ed 100644
--- a/src/output.c
+++ b/src/output.c
@@ -9,10 +9,9 @@
 #define _POSIX_C_SOURCE 200809L
 #include "config.h"
 #include <assert.h>
-#include <types/wlr_output.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
-#include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/region.h>
 #include <wlr/util/log.h>
@@ -412,7 +411,9 @@ handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
 		break;
 	case ZWLR_OUTPUT_POWER_V1_MODE_ON:
 		wlr_output_enable(event->output, true);
-		output_ensure_buffer(event->output);
+		if (!wlr_output_test(event->output)) {
+			wlr_output_rollback(event->output);
+		}
 		wlr_output_commit(event->output);
 		break;
 	}