diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index ba30b88113..04921fe14d 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -3330,17 +3330,12 @@ function MyController(hand) {
             return;
         }
 
-        var isSameEntityInBothControllers = false;
-        if (leftController.grabbedThingID && rightController.grabbedThingID &&
-            leftController.grabbedThingID == rightController.grabbedThingID) {
-                isSameEntityInBothControllers = true;
-        }
-        
         if (!this.shouldScale) {
             //  If both secondary triggers squeezed, and the non-holding hand is empty, start scaling
             if (this.secondarySqueezed() &&
                 this.getOtherHandController().secondarySqueezed() &&
-                isSameEntityInBothControllers) {
+                this.grabbedThingID && this.getOtherHandController().grabbedThingID &&
+                this.grabbedThingID == this.getOtherHandController().grabbedThingID) {
                 this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(),
                                                                       this.getOtherHandController().getHandPosition()));
                 this.scalingStartDimensions = props.dimensions;