diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
index 2f9caf17c2..362176e5d7 100644
--- a/src/waylandwindow.cpp
+++ b/src/waylandwindow.cpp
@@ -151,8 +151,13 @@ void WaylandWindow::updateClientOutputs()
     if (isDeleted()) {
         return;
     }
-    surface()->setOutputs(waylandServer()->display()->outputsIntersecting(frameGeometry().toAlignedRect()),
-                          waylandServer()->display()->largestIntersectingOutput(frameGeometry().toAlignedRect()));
+    const auto rect = frameGeometry().toAlignedRect();
+    if (rect.isEmpty()) {
+        return;
+    }
+
+    surface()->setOutputs(waylandServer()->display()->outputsIntersecting(rect),
+                          waylandServer()->display()->largestIntersectingOutput(rect));
 }
 
 void WaylandWindow::updateIcon()