diff --git a/js/gamepad.js b/js/gamepad.js
index 94ddb52..54f61b6 100644
--- a/js/gamepad.js
+++ b/js/gamepad.js
@@ -97,11 +97,7 @@ class Gamepad {
     }
 
     getActiveGamepad() {
-        if (null === this.activeGamepadIndex) {
-            return null;
-        }
-
-        return this.gamepads[this.activeGamepadIndex];
+        return this.activeGamepad;
     }
 
     addGamepad(gamepad) {