diff --git a/types/output/output.c b/types/output/output.c
index 51a316c2e..04361231a 100644
--- a/types/output/output.c
+++ b/types/output/output.c
@@ -817,7 +817,8 @@ bool wlr_output_commit_state(struct wlr_output *output,
 		output->needs_frame = false;
 	}
 
-	if (pending.committed & WLR_OUTPUT_STATE_BUFFER) {
+	if ((pending.committed & WLR_OUTPUT_STATE_BUFFER) &&
+			output->swapchain != NULL) {
 		wlr_swapchain_set_buffer_submitted(output->swapchain, pending.buffer);
 	}