diff --git a/command.c b/command.c
index d6b4a13b1e..b0878fbded 100644
--- a/command.c
+++ b/command.c
@@ -1018,10 +1018,10 @@ static void command_event_init_controllers(void)
             set_controller = true;
             break;
          case RETRO_DEVICE_JOYPAD:
-            /* ideally this check wouldn't be required but if we always
+            /* ideally these checks shouldn't be required but if we always
              *  call core_set_controller_port_device input won't work on 
-             *  cores that don't set port information */
-            if (info->ports.size != 0)
+             *  cores that don't set port information properly */
+            if (info->ports.size != 0 && i < info->ports.size)
                set_controller = true;
             break;
          default: