diff --git a/composite.cpp b/composite.cpp
index a9f8389132..d8f4f2840a 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -892,7 +892,10 @@ void Client::finishCompositing()
 {
     Toplevel::finishCompositing();
     updateVisibility();
-    updateDecoration(true, true);
+    if (!deleting) {
+        // only recreate the decoration if we are not shutting down completely
+        updateDecoration(true, true);
+    }
     // for safety in case KWin is just resizing the window
     s_haveResizeEffect = false;
 }