diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 5a4f38c15..96b443061 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -403,8 +403,8 @@ SDL_JoystickQuit(void)
     /* Stop the event polling */
     SDL_numjoysticks = 0;
 
-    for (i = 0; i < numsticks; i++) {
-        SDL_Joystick *stick = SDL_joysticks[0];
+    for (i = numjoysticks; i--; ) {
+        SDL_Joystick *stick = SDL_joysticks[i];
         if (stick && (stick->ref_count >= 1)) {
             stick->ref_count = 1;
             SDL_JoystickClose(stick);