diff --git a/src/components/cursor-controller.js b/src/components/cursor-controller.js
index 4c95466f94159f1cf3e5a3fb911208cd42b1b5f3..ba0398a6224a012d4f90bc58577791d42b6a555a 100644
--- a/src/components/cursor-controller.js
+++ b/src/components/cursor-controller.js
@@ -386,7 +386,7 @@ AFRAME.registerComponent("cursor-controller", {
   },
 
   _handlePrimaryDown: function(e) {
-    if (e.target === this.controller || e.type === "gamepadbuttondown") {
+    if (e.target === this.controller) {
       const isInteractable = this._isTargetOfType(TARGET_TYPE_INTERACTABLE) && !this.grabStarting;
       if (isInteractable || this._isTargetOfType(TARGET_TYPE_UI)) {
         this.grabStarting = true;
@@ -398,7 +398,7 @@ AFRAME.registerComponent("cursor-controller", {
   },
 
   _handlePrimaryUp: function(e) {
-    if (e.target === this.controller || e.type === "gamepadbuttonup") {
+    if (e.target === this.controller) {
       if (this._isGrabbing() || this._isTargetOfType(TARGET_TYPE_UI)) {
         this.grabStarting = false;
         this.data.cursor.emit("cursor-release", e.detail);
diff --git a/src/hub.html b/src/hub.html
index e91be3d6b24e42f84b9f48e0de7f624747513c3d..c8771f3137f4d9c1c45b71579cd911eb101e2575 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -230,7 +230,6 @@
             ik-root
             player-info
             networked-avatar
-            gamepad-controls
         >
             <a-entity
                 id="player-hud"
diff --git a/src/hub.js b/src/hub.js
index 1c71658bfcf454ce7150cb8b201032b42c926dc4..8d0086d4ff41cedf85f50113e5fb7b6384474215 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -90,7 +90,6 @@ if (qs.quality) {
 import "aframe-physics-system";
 import "aframe-physics-extras";
 import "aframe-extras/src/pathfinding";
-import "aframe-extras/src/controls/gamepad-controls";
 import "super-hands";
 import "./components/super-networked-interactable";
 import "./components/networked-counter";