diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index f8dce617f..1aebae797 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -2653,7 +2653,8 @@ _glfwDispatchX11Events(void) {
     unsigned dispatched = 0;
 
 #if defined(__linux__)
-    _glfwDetectJoystickConnectionLinux();
+    if (_glfw.joysticksInitialized)
+        _glfwDetectJoystickConnectionLinux();
 #endif
     dispatched += dispatch_x11_queued_events(XEventsQueued(_glfw.x11.display, QueuedAfterFlush));