diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index 467b8338a..7c00d2a16 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -1071,7 +1071,6 @@ static void onConfigChange()
 static void processEvent(XEvent *event)
 {
     _GLFWwindow* window = NULL;
-    Bool filtered = False;
 
     if (_glfw.x11.randr.available)
     {
@@ -1163,6 +1162,12 @@ static void processEvent(XEvent *event)
         return;
     }
 
+    if (event->type == ClientMessage && event->xclient.message_type == _glfw.x11.NULL_ && event->xproperty.window == _glfw.x11.helperWindowHandle)
+    {
+        // empty event generated by _glfwPlatformPostEmptyEvent
+        return;
+    }
+
     if (XFindContext(_glfw.x11.display,
                      event->xany.window,
                      _glfw.x11.context,
@@ -1386,9 +1391,6 @@ static void processEvent(XEvent *event)
         {
             // Custom client message, probably from the window manager
 
-            if (filtered)
-                return;
-
             if (event->xclient.message_type == None)
                 return;