diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
index 5cc991d8d2..41352a4398 100644
--- a/src/waylandwindow.cpp
+++ b/src/waylandwindow.cpp
@@ -156,6 +156,9 @@ bool WaylandWindow::belongsToDesktop() const
 
 void WaylandWindow::updateClientOutputs()
 {
+    if (isDeleted()) {
+        return;
+    }
     surface()->setOutputs(waylandServer()->display()->outputsIntersecting(frameGeometry().toAlignedRect()));
     if (output()) {
         surface()->setPreferredScale(output()->scale());