diff --git a/src/backend/drm/DRM.cpp b/src/backend/drm/DRM.cpp
index 3bd4daa..22d905a 100644
--- a/src/backend/drm/DRM.cpp
+++ b/src/backend/drm/DRM.cpp
@@ -1429,11 +1429,6 @@ bool Aquamarine::CDRMOutput::commitState(bool onlyTest) {
         }
     }
 
-    if (STATE.drmFormat == DRM_FORMAT_INVALID) {
-        backend->backend->log(AQ_LOG_ERROR, "drm: No format for output");
-        return false;
-    }
-
     if (COMMITTED & COutputState::eOutputStateProperties::AQ_OUTPUT_STATE_FORMAT) {
         // verify the format is valid for the primary plane
         bool ok = false;
@@ -1450,6 +1445,11 @@ bool Aquamarine::CDRMOutput::commitState(bool onlyTest) {
         }
     }
 
+    if (STATE.enabled && STATE.drmFormat == DRM_FORMAT_INVALID) {
+        backend->backend->log(AQ_LOG_ERROR, "drm: No format for output");
+        return false;
+    }
+
     if (STATE.adaptiveSync && !connector->canDoVrr) {
         backend->backend->log(AQ_LOG_ERROR, "drm: No Adaptive sync support for output");
         return false;