diff --git a/src/x11_window.c b/src/x11_window.c
index 76f1483e..4cd32940 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -2776,7 +2776,8 @@ void _glfwPlatformPollEvents(void)
     _GLFWwindow* window;
 
 #if defined(__linux__)
-    _glfwDetectJoystickConnectionLinux();
+    if (_glfw.joysticksInitialized)
+        _glfwDetectJoystickConnectionLinux();
 #endif
     XPending(_glfw.x11.display);