diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index e2de13d4b1..6b671d366f 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -1034,9 +1034,18 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp) {
 
 function getControllerJointIndex(hand) {
     if (HMD.isHandControllerAvailable()) {
-        return MyAvatar.getJointIndex(hand === RIGHT_HAND ?
-                                      "_CONTROLLER_RIGHTHAND" :
-                                      "_CONTROLLER_LEFTHAND");
+        var controllerJointIndex = -1;
+        if (Camera.mode === "first person") {
+            controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+                                                          "_CONTROLLER_RIGHTHAND" :
+                                                          "_CONTROLLER_LEFTHAND");
+        } else if (Camera.mode === "third person") {
+            controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+                                                          "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
+                                                          "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
+        }
+        
+        return controllerJointIndex;
     }
 
     return MyAvatar.getJointIndex("Head");