diff --git a/src/workspace.cpp b/src/workspace.cpp
index 53dde836ef..a557fab8cf 100644
--- a/src/workspace.cpp
+++ b/src/workspace.cpp
@@ -1325,8 +1325,8 @@ void Workspace::updateOutputs(const QVector<Output *> &outputOrder)
                 m_outputOrder.push_back(output);
             }
         }
-        m_outputOrder.erase(std::remove_if(m_outputOrder.begin(), m_outputOrder.end(), [](Output *output) {
-                                return !output->isEnabled();
+        m_outputOrder.erase(std::remove_if(m_outputOrder.begin(), m_outputOrder.end(), [this](Output *output) {
+                                return !m_outputs.contains(output);
                             }),
                             m_outputOrder.end());
     }