--- a/sys/dev/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/sys/dev/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -2076,9 +2076,10 @@
 				dc);
 DRM_DEBUG("dfly: apply_single_controller_ctx_to_hw status = %d, i = %d", status, i);
 
-		if (DC_OK != status) {
-			return status;
-		}
+		if (DC_OK != status) {
+			dcb->funcs->set_scratch_critical_state(dcb, false);
+			return status;
+		}
 	}
 
 	dcb->funcs->set_scratch_critical_state(dcb, false);