diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
index defcfe9539..3e3d36539c 100644
--- a/src/abstract_client.cpp
+++ b/src/abstract_client.cpp
@@ -1498,7 +1498,7 @@ void AbstractClient::setupWindowManagementInterface()
         return;
     }
     using namespace KWaylandServer;
-    auto w = waylandServer()->windowManagement()->createWindow(waylandServer()->windowManagement(), internalId());
+    auto w = waylandServer()->windowManagement()->createWindow(this, internalId());
     w->setTitle(caption());
     w->setVirtualDesktop(isOnAllDesktops() ? 0 : desktop() - 1);
     w->setActive(isActive());
@@ -1685,14 +1685,6 @@ void AbstractClient::setupWindowManagementInterface()
     m_windowManagementInterface = w;
 }
 
-void AbstractClient::destroyWindowManagementInterface()
-{
-    if (m_windowManagementInterface) {
-        m_windowManagementInterface->unmap();
-        m_windowManagementInterface = nullptr;
-    }
-}
-
 Options::MouseCommand AbstractClient::getMouseCommand(Qt::MouseButton button, bool *handled) const
 {
     *handled = false;
diff --git a/src/abstract_client.h b/src/abstract_client.h
index 7577cfceb0..4fad9eeaa5 100644
--- a/src/abstract_client.h
+++ b/src/abstract_client.h
@@ -999,7 +999,6 @@ protected:
     virtual void doSetQuickTileMode();
 
     void setupWindowManagementInterface();
-    void destroyWindowManagementInterface();
     void updateColorScheme();
     void setTransientFor(AbstractClient *transientFor);
     /**
diff --git a/src/x11client.cpp b/src/x11client.cpp
index 6caa15015d..cc46887259 100644
--- a/src/x11client.cpp
+++ b/src/x11client.cpp
@@ -206,7 +206,6 @@ void X11Client::releaseWindow(bool on_shutdown)
         tabBox->nextPrev(true);
     }
 #endif
-    destroyWindowManagementInterface();
     Deleted* del = nullptr;
     if (!on_shutdown) {
         del = Deleted::create(this);
@@ -279,7 +278,6 @@ void X11Client::destroyClient()
         tabBox->nextPrev(true);
     }
 #endif
-    destroyWindowManagementInterface();
     Deleted* del = Deleted::create(this);
     if (isMoveResize())
         emit clientFinishUserMovedResized(this);
diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
index 773e93122c..2e7069be19 100644
--- a/src/xdgshellclient.cpp
+++ b/src/xdgshellclient.cpp
@@ -328,7 +328,6 @@ void XdgSurfaceClient::destroyClient()
     emit windowClosed(this, deleted);
     StackingUpdatesBlocker blocker(workspace());
     RuleBook::self()->discardUsed(this, true);
-    destroyWindowManagementInterface();
     destroyDecoration();
     cleanGrouping();
     waylandServer()->removeClient(this);