diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js
index ca3b43bd37..3481639cc5 100644
--- a/scripts/system/controllers/grab.js
+++ b/scripts/system/controllers/grab.js
@@ -479,6 +479,10 @@ Grabber.prototype.keyPressEvent = function(event) {
 Grabber.prototype.cleanup = function() {
     Pointers.removePointer(this.mouseRayEntities);
     Picks.removePick(this.mouseRayOverlays);
+    if (this.grabID) {
+        MyAvatar.releaseGrab(this.grabID);
+        this.grabID = null;
+    }
 };
 
 var grabber = new Grabber();