diff --git a/src/window.cpp b/src/window.cpp
index 7f7545ef82..c0b6844f30 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2158,10 +2158,7 @@ void Window::setupWindowManagementInterface()
         // already setup
         return;
     }
-    if (!waylandServer() || !surface()) {
-        return;
-    }
-    if (!waylandServer()->windowManagement()) {
+    if (!waylandServer() || !waylandServer()->windowManagement()) {
         return;
     }
     using namespace KWaylandServer;