diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index c21cdb00b..06acb8686 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -548,10 +548,14 @@ static bool scan_out_fullscreen_view(struct sway_output *output,
 		return false;
 	}
 
+	wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
+	if (!wlr_output_test(wlr_output)) {
+		return false;
+	}
+
 	wlr_presentation_surface_sampled_on_output(server.presentation, surface,
 		wlr_output);
 
-	wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
 	return wlr_output_commit(wlr_output);
 }