diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 07fbe0b4105..265f0bb3f19 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -891,12 +891,7 @@ bool QWaylandDisplay::supportsWindowDecoration() const
     if (disabled)
         return false;
 
-    // Don't initialize client buffer integration just to check whether it can have a decoration.
-    if (!mWaylandIntegration->mClientBufferIntegrationInitialized)
-        return true;
-
-    // We can do software-rendered decorations, only disable them if the integration explicitly says it can't.
-    static bool integrationSupport = !clientBufferIntegration() || clientBufferIntegration()->supportsWindowDecoration();
+    static bool integrationSupport = clientBufferIntegration() && clientBufferIntegration()->supportsWindowDecoration();
     return integrationSupport;
 }