diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp
index fcb15b5a18..afccaeca55 100644
--- a/src/backends/drm/drm_backend.cpp
+++ b/src/backends/drm/drm_backend.cpp
@@ -377,7 +377,7 @@ bool DrmBackend::applyOutputChanges(const OutputConfiguration &config)
             }
             if (const auto changeset = config.constChangeSet(output)) {
                 output->queueChanges(changeset);
-                if (changeset->enabled) {
+                if (changeset->enabled.value_or(output->isEnabled())) {
                     toBeEnabled << output;
                 } else {
                     toBeDisabled << output;
diff --git a/src/core/outputbackend.cpp b/src/core/outputbackend.cpp
index 6d7631cd4a..e38b57839c 100644
--- a/src/core/outputbackend.cpp
+++ b/src/core/outputbackend.cpp
@@ -50,7 +50,7 @@ bool OutputBackend::applyOutputChanges(const OutputConfiguration &config)
     QList<Output *> toBeDisabledOutputs;
     for (const auto &output : availableOutputs) {
         if (const auto changeset = config.constChangeSet(output)) {
-            if (changeset->enabled) {
+            if (changeset->enabled.value_or(output->isEnabled())) {
                 toBeEnabledOutputs << output;
             } else {
                 toBeDisabledOutputs << output;