diff --git a/src/assets/stylesheets/hub.scss b/src/assets/stylesheets/hub.scss
index dd69bc88ab5e30c2022269a128f1f910171a6673..d9519c92fcc0b05dae6916bcf1b06f087c0e14d2 100644
--- a/src/assets/stylesheets/hub.scss
+++ b/src/assets/stylesheets/hub.scss
@@ -8,7 +8,7 @@
 @import 'audio';
 @import 'info-dialog';
 
-.a-enter-vr {
+.a-enter-vr, .a-orientation-modal {
   display: none;
 }
 
diff --git a/src/components/hand-controls2.js b/src/components/hand-controls2.js
index e8aca3e7c9f99d5517498ad63b9bc9f8e637c158..ca01817e09fed3c0ff5f537cce86daa6b9ec9b3e 100644
--- a/src/components/hand-controls2.js
+++ b/src/components/hand-controls2.js
@@ -13,6 +13,7 @@ const POSES = {
 export const CONTROLLER_OFFSETS = {
   default: new THREE.Matrix4(),
   "oculus-touch-controls": new THREE.Matrix4().makeTranslation(0, -0.015, 0.04),
+  "oculus-go-controls": new THREE.Matrix4(),
   "vive-controls": new THREE.Matrix4().compose(
     new THREE.Vector3(0, -0.017, 0.13),
     new THREE.Quaternion().setFromEuler(new THREE.Euler(-40 * THREE.Math.DEG2RAD, 0, 0)),
@@ -115,6 +116,7 @@ AFRAME.registerComponent("hand-controls2", {
     if (hand !== prevData) {
       el.setAttribute("vive-controls", controlConfiguration);
       el.setAttribute("oculus-touch-controls", controlConfiguration);
+      el.setAttribute("oculus-go-controls", controlConfiguration);
       el.setAttribute("windows-motion-controls", controlConfiguration);
       el.setAttribute("daydream-controls", controlConfiguration);
       el.setAttribute("gearvr-controls", controlConfiguration);
diff --git a/src/hub.html b/src/hub.html
index 76fb7230c3135468f4b10392a5269f20a65bfb88..ea2cff76be0c6b198f9926f715694a5036c55448 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -33,7 +33,8 @@
         mute-mic="eventSrc: a-scene; toggleEvents: action_mute"
         freeze-controller="toggleEvent: action_freeze"
         personal-space-bubble="debug: false;"
-        >
+        vr-mode-ui="enabled: false"
+    >
 
         <a-assets>
             <img id="tooltip"  src="./assets/hud/tooltip.9.png" >
diff --git a/src/input-mappings.js b/src/input-mappings.js
index f9985498157ac70bec292eacfe241dfbb5927355..14636bd85c4cf8318ac6fab7d7b1a505eabe0045 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -34,6 +34,9 @@ const config = {
       },
       "gearvr-controls": {
         trackpad: "trackpad_dpad4"
+      },
+      "oculus-go-controls": {
+        trackpad: "trackpad_dpad4"
       }
     }
   },
@@ -123,6 +126,16 @@ const config = {
         triggerdown: ["action_primary_down"],
         triggerup: ["action_primary_up"]
       },
+      "oculus-go-controls": {
+        trackpad_dpad4_pressed_west_down: "snap_rotate_left",
+        trackpad_dpad4_pressed_east_down: "snap_rotate_right",
+        trackpad_dpad4_pressed_center_down: ["action_primary_down"],
+        trackpad_dpad4_pressed_north_down: ["action_primary_down"],
+        trackpad_dpad4_pressed_south_down: ["action_primary_down"],
+        trackpadup: ["action_primary_up"],
+        triggerdown: ["action_primary_down"],
+        triggerup: ["action_primary_up"]
+      },
       keyboard: {
         m_press: "action_mute",
         q_press: "snap_rotate_left",
@@ -182,6 +195,10 @@ const config = {
       "gearvr-controls": {
         trackpaddown: { right: "action_ui_select_down" },
         trackpadup: { right: "action_ui_select_up" }
+      },
+      "oculus-go-controls": {
+        trackpaddown: { right: "action_ui_select_down" },
+        trackpadup: { right: "action_ui_select_up" }
       }
     }
   }