diff --git a/shell_client.h b/shell_client.h
--- a/shell_client.h
+++ b/shell_client.h
@@ -33,7 +33,6 @@
 class ServerSideDecorationPaletteInterface;
 class AppMenuInterface;
 class PlasmaShellSurfaceInterface;
-class QtExtendedSurfaceInterface;
 class XdgDecorationInterface;
 }
 }
@@ -139,7 +138,6 @@
     }
 
     void installPlasmaShellSurface(KWayland::Server::PlasmaShellSurfaceInterface *surface);
-    void installQtExtendedSurface(KWayland::Server::QtExtendedSurfaceInterface *surface);
     void installServerSideDecoration(KWayland::Server::ServerSideDecorationInterface *decoration);
     void installAppMenu(KWayland::Server::AppMenuInterface *appmenu);
     void installPalette(KWayland::Server::ServerSideDecorationPaletteInterface *palette);
@@ -255,7 +253,6 @@
     QRect m_geomMaximizeRestore; // size and position of the window before it was set to maximize
     NET::WindowType m_windowType = NET::Normal;
     QPointer<KWayland::Server::PlasmaShellSurfaceInterface> m_plasmaShellSurface;
-    QPointer<KWayland::Server::QtExtendedSurfaceInterface> m_qtExtendedSurface;
     QPointer<KWayland::Server::AppMenuInterface> m_appMenuInterface;
     QPointer<KWayland::Server::ServerSideDecorationPaletteInterface> m_paletteInterface;
     KWayland::Server::ServerSideDecorationInterface *m_serverDecoration = nullptr;
diff --git a/shell_client.cpp b/shell_client.cpp
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -714,8 +714,6 @@
         m_xdgShellSurface->close();
         const qint32 pingSerial = static_cast<XdgShellInterface *>(m_xdgShellSurface->global())->ping(m_xdgShellSurface);
         m_pingSerials.insert(pingSerial, PingReason::CloseWindow);
-    } else if (m_qtExtendedSurface && isCloseable()) {
-        m_qtExtendedSurface->close();
     } else if (m_internalWindow) {
         m_internalWindow->hide();
     }
@@ -738,7 +736,7 @@
     if (m_internal) {
         return true;
     }
-    return m_qtExtendedSurface ? true : false;
+    return false;
 }
 
 bool ShellClient::isFullScreen() const
@@ -1450,19 +1448,6 @@
     return false;
 }
 
-void ShellClient::installQtExtendedSurface(QtExtendedSurfaceInterface *surface)
-{
-    m_qtExtendedSurface = surface;
-
-    connect(m_qtExtendedSurface.data(), &QtExtendedSurfaceInterface::raiseRequested, this, [this]() {
-        workspace()->raiseClientRequest(this);
-    });
-    connect(m_qtExtendedSurface.data(), &QtExtendedSurfaceInterface::lowerRequested, this, [this]() {
-        workspace()->lowerClientRequest(this);
-    });
-    m_qtExtendedSurface->installEventFilter(this);
-}
-
 void ShellClient::installAppMenu(AppMenuInterface *menu)
 {
     m_appMenuInterface = menu;
diff --git a/wayland_server.h b/wayland_server.h
--- a/wayland_server.h
+++ b/wayland_server.h
@@ -240,7 +240,6 @@
     KWayland::Server::PlasmaShellInterface *m_plasmaShell = nullptr;
     KWayland::Server::PlasmaWindowManagementInterface *m_windowManagement = nullptr;
     KWayland::Server::PlasmaVirtualDesktopManagementInterface *m_virtualDesktopManagement = nullptr;
-    KWayland::Server::QtSurfaceExtensionInterface *m_qtExtendedSurface = nullptr;
     KWayland::Server::ServerSideDecorationManagerInterface *m_decorationManager = nullptr;
     KWayland::Server::OutputManagementInterface *m_outputManagement = nullptr;
     KWayland::Server::AppMenuManagerInterface *m_appMenuManager = nullptr;
diff --git a/wayland_server.cpp b/wayland_server.cpp
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -295,17 +295,6 @@
             }
         }
     );
-
-
-    m_qtExtendedSurface = m_display->createQtSurfaceExtension(m_display);
-    m_qtExtendedSurface->create();
-    connect(m_qtExtendedSurface, &QtSurfaceExtensionInterface::surfaceCreated,
-        [this] (QtExtendedSurfaceInterface *surface) {
-            if (ShellClient *client = findClient(surface->surface())) {
-                client->installQtExtendedSurface(surface);
-            }
-        }
-    );
     m_appMenuManager = m_display->createAppMenuManagerInterface(m_display);
     m_appMenuManager->create();
     connect(m_appMenuManager, &AppMenuManagerInterface::appMenuCreated,