diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index 8baa95cb1..90fc83e55 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -2489,7 +2489,7 @@ _glfwDispatchX11Events(void) {
     unsigned dispatched = 0;
 
 #if defined(__linux__)
-    _glfwDetectJoystickConnectionLinux();
+    if (_glfw.hints.init.enableJoysticks) _glfwDetectJoystickConnectionLinux();
 #endif
     dispatched += dispatch_x11_queued_events(XEventsQueued(_glfw.x11.display, QueuedAfterFlush));