diff --git a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
index fcf4345c..5892f566 100644
--- a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
+++ b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
@@ -286,7 +286,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
             // This is the back button on Shield portable consoles
             context.controllerNumber = 0;
         }
-        else if (multiControllerEnabled) {
+        else if (multiControllerEnabled && context.hasJoystickAxes) {
             context.controllerNumber = assignNewControllerNumber();
         }
         else {