diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index a84943da0..15e170a51 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -696,14 +696,6 @@ meta_compositor_process_event (MetaCompositor *compositor,
 	}
     }
 
-  /*
-   * This trap is so that none of the compositor functions cause
-   * X errors. This is really a hack, but I'm afraid I don't understand
-   * enough about Metacity/X to know how else you are supposed to do it
-   */
-
-
-  meta_error_trap_push (compositor->display);
   switch (event->type)
     {
     case PropertyNotify:
@@ -726,8 +718,6 @@ meta_compositor_process_event (MetaCompositor *compositor,
       break;
     }
 
-  meta_error_trap_pop (compositor->display, FALSE);
-
   /* Clutter needs to know about MapNotify events otherwise it will
      think the stage is invisible */
   if (event->type == MapNotify)