diff --git a/source/common/input.cpp b/source/common/input.cpp
index 0e231a8..275b980 100644
--- a/source/common/input.cpp
+++ b/source/common/input.cpp
@@ -83,7 +83,7 @@ void Input::bindGameControllerButton(int index, inputs_e inputTarget, inputs_e i
 // Comprueba si un input esta activo
 bool Input::checkInput(inputs_e input, bool repeat, int device, int index)
 {
-	if (!enabled || index >= numGamepads)
+	if (!enabled)
 	{
 		return false;
 	}
@@ -140,7 +140,7 @@ bool Input::checkInput(inputs_e input, bool repeat, int device, int index)
 		}
 	}
 
-	if (gameControllerFound())
+	if (gameControllerFound() &&  index < numGamepads)
 		if ((device == INPUT_USE_GAMECONTROLLER) || (device == INPUT_USE_ANY))
 		{
 			successGameController = checkAxisInput(input, index);