diff --git a/input/drivers_joypad/xinput_hybrid_joypad.c b/input/drivers_joypad/xinput_hybrid_joypad.c
index cb57417f6aa5..988c3ee84f97 100644
--- a/input/drivers_joypad/xinput_hybrid_joypad.c
+++ b/input/drivers_joypad/xinput_hybrid_joypad.c
@@ -242,6 +242,11 @@ static BOOL CALLBACK enum_joypad_cb_hybrid(
    if (g_joypad_cnt == MAX_USERS)
       return DIENUM_STOP;
 
+   while(!g_xinput_states[g_last_xinput_pad_idx].connected && g_last_xinput_pad_idx < DEFAULT_MAX_PADS)
+   {
+      g_last_xinput_pad_idx++;
+   }
+
    pad = &g_pads[g_joypad_cnt].joypad;
 
 #ifdef __cplusplus