diff --git a/types/output/output.c b/types/output/output.c
index ae18ea8d..b45576fa 100644
--- a/types/output/output.c
+++ b/types/output/output.c
@@ -835,7 +835,7 @@ bool wlr_output_commit_state(struct wlr_output *output,
 		.output = output,
 		.committed = pending.committed,
 		.when = &now,
-		.buffer = back_buffer,
+		.buffer = (pending.committed & WLR_OUTPUT_STATE_BUFFER) ? pending.buffer : NULL,
 	};
 	wlr_signal_emit_safe(&output->events.commit, &event);