diff --git a/wayland_server.cpp b/wayland_server.cpp
index 5c1c9b2f79..6b958b9f18 100644
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -70,6 +70,10 @@ void WaylandServer::init(const QByteArray &socketName)
                 // it's possible that a Surface gets created before Workspace is created
                 return;
             }
+            if (surface->client() != xWaylandConnection()) {
+                // setting surface is only relevat for Xwayland clients
+                return;
+            }
             auto check = [surface] (const Toplevel *t) {
                 return t->surfaceId() == surface->id();
             };