diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
index e668e6bdcb..5fed0ca37e 100644
--- a/src/wayland_server.cpp
+++ b/src/wayland_server.cpp
@@ -604,6 +604,8 @@ void WaylandServer::initWorkspace()
         });
     }
 
+    initOutputs();
+
     if (hasScreenLockerIntegration()) {
         if (m_internalConnection.interfacesAnnounced) {
             initScreenLocker();
@@ -613,8 +615,6 @@ void WaylandServer::initWorkspace()
     } else {
         emit initialized();
     }
-
-    initOutputs();
 }
 
 void WaylandServer::initScreenLocker()