diff --git a/scene.cpp b/scene.cpp
index 7d9f3d2dd1..834a731e60 100644
--- a/scene.cpp
+++ b/scene.cpp
@@ -964,7 +964,8 @@ void WindowPixmap::create()
     if (isValid() || toplevel()->isDeleted()) {
         return;
     }
-    if (toplevel()->surface()) {
+    // always update from Buffer on Wayland, don't try using XPixmap
+    if (kwinApp()->shouldUseWaylandForCompositing()) {
         // use Buffer
         updateBuffer();
         if ((m_buffer || !m_fbo.isNull()) && m_subSurface.isNull()) {