diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 2a5b90b0f..72c5656d2 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -582,12 +582,11 @@ SDL_JoystickFromInstanceID(SDL_JoystickID joyid)
     SDL_LockJoysticks();
     for (joystick = SDL_joysticks; joystick; joystick = joystick->next) {
         if (joystick->instance_id == joyid) {
-            SDL_UnlockJoysticks();
-            return joystick;
+            break;
         }
     }
     SDL_UnlockJoysticks();
-    return NULL;
+    return joystick;
 }
 
 /*