diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
index c7440e244..d0a2ca3ba 100644
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -151,10 +151,15 @@ handle_host_xevent (MetaBackend *backend,
 {
   MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
   MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+  MetaDisplay *display = meta_get_display ();
+  MetaCompositor *compositor = display->compositor;
   gboolean bypass_clutter = FALSE;
 
   XGetEventData (priv->xdisplay, &event->xcookie);
 
+  if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
+    bypass_clutter = TRUE;
+
   if (event->type == (priv->xsync_event_base + XSyncAlarmNotify))
     handle_alarm_notify (backend, event);
 
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 60a4c0b90..318e07ac7 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -741,9 +741,6 @@ meta_compositor_process_event (MetaCompositor *compositor,
                                XEvent         *event,
                                MetaWindow     *window)
 {
-  if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
-    return TRUE;
-
   if (!meta_is_wayland_compositor () &&
       event->type == meta_display_get_damage_event_base (compositor->display) + XDamageNotify)
     {