diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index e39c424521..57a5a2067a 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -26,6 +26,8 @@ Script.load("system/controllers/handControllerPointer.js");
 Script.load("system/controllers/squeezeHands.js");
 Script.load("system/controllers/grab.js");
 Script.load("system/controllers/teleport.js");
-Script.load("system/controllers/advancedMovement.js")
+if (Controller.Hardware.Vive !== undefined) {
+    Script.load("system/controllers/advancedMovement.js")
+}
 Script.load("system/dialTone.js");
-Script.load("system/firstPersonHMD.js");
+Script.load("system/firstPersonHMD.js");
\ No newline at end of file
diff --git a/scripts/system/controllers/advancedMovement.js b/scripts/system/controllers/advancedMovement.js
index 9216b45072..e3085ee6bf 100644
--- a/scripts/system/controllers/advancedMovement.js
+++ b/scripts/system/controllers/advancedMovement.js
@@ -17,9 +17,10 @@ function addTranslationToLeftStick() {
 function registerMappings() {
     mappingName = 'Hifi-AdvancedMovement-Dev-' + Math.random();
     advancedMapping = Controller.newMapping(mappingName);
-    advancedMapping.from(Controller.Vive.LY).when(Controller.Vive.LSY).invert().to(Controller.Standard.LY);
-    advancedMapping.from(Controller.Vive.LX).when(Controller.Vive.LSX).to(Controller.Standard.LX);
-    advancedMapping.from(Controller.Vive.RY).when(Controller.Vive.RSY).invert().to(Controller.Standard.RY);
+    var VIVE = Controller.Hardware.Vive;
+    advancedMapping.from(VIVE.LY).when(Controller.Vive.LSY).invert().to(Controller.Standard.LY);
+    advancedMapping.from(VIVE.LX).when(Controller.Vive.LSX).to(Controller.Standard.LX);
+    advancedMapping.from(VIVE.RY).when(Controller.Vive.RSY).invert().to(Controller.Standard.RY);
 }
 
 function removeTranslationFromLeftStick() {