diff --git a/composite.cpp b/composite.cpp
index f4d1e3d8ab..557ef2b6e6 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -322,6 +322,13 @@ void Compositor::startupWithWorkspace()
         c->setupCompositing();
         c->getShadow();
     }
+    if (auto w = waylandServer()) {
+        const auto clients = w->clients();
+        for (auto c : clients) {
+            c->setupCompositing();
+            c->getShadow();
+        }
+    }
 
     emit compositingToggled(true);