diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 52f7b4634..7660e40dd 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -1858,6 +1858,8 @@ check_needs_pixmap (MetaWindowActor *self)
       priv->size_changed = FALSE;
     }
 
+  meta_error_trap_push (display);
+
   if (priv->back_pixmap == None)
     {
       gint pxm_width, pxm_height;
@@ -1908,6 +1910,8 @@ check_needs_pixmap (MetaWindowActor *self)
       meta_window_actor_update_bounding_region_and_borders (self, pxm_width, pxm_height);
     }
 
+  meta_error_trap_pop (display);
+
   priv->needs_pixmap = FALSE;
 }