diff --git a/README.md b/README.md
index a9f0d935..e08d56c9 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,8 @@ information on what to include when reporting a bug.
 ## Changelog
 
  - [X11] Bugfix: IME input of CJK was broken for "C" locale (#1587,#1636)
+ - [X11] Bugfix: Xlib errors caused by other parts of the application could be
+   reported as GLFW errors
 
 
 ## Contact
diff --git a/src/x11_init.c b/src/x11_init.c
index ee6c8720..a34bd591 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -851,6 +851,9 @@ static Window createHelperWindow(void)
 //
 static int errorHandler(Display *display, XErrorEvent* event)
 {
+    if (_glfw.x11.display != display)
+        return 0;
+
     _glfw.x11.errorCode = event->error_code;
     return 0;
 }