diff --git a/glfw/x11_init.c b/glfw/x11_init.c
index 2408f62d0..dab6f6809 100644
--- a/glfw/x11_init.c
+++ b/glfw/x11_init.c
@@ -502,8 +502,10 @@ static Window createHelperWindow(void)
 
 // X error handler
 //
-static int errorHandler(Display *display UNUSED, XErrorEvent* event)
+static int errorHandler(Display *display, XErrorEvent* event)
 {
+    if (_glfw.x11.display != display)
+        return 0;
     _glfw.x11.errorCode = event->error_code;
     return 0;
 }