diff --git a/js/gamepad.js b/js/gamepad.js
index 9db7b79..0d06c18 100644
--- a/js/gamepad.js
+++ b/js/gamepad.js
@@ -152,8 +152,6 @@ class Gamepad {
     }
 
     mapGamepad(gamepadIndex) {
-        this.removeGamepad();
-        
         this.activeGamepadIndex = gamepadIndex;
         const gamepad = this.gamepads[this.activeGamepadIndex];
 
@@ -348,7 +346,6 @@ class Gamepad {
         this.debug = !this.debug;
 
         // remap current gamepad
-        this.removeGamepad();
         this.mapGamepad(this.activeGamepadIndex);
     }
 }