diff --git a/src/components/sticky-object.js b/src/components/sticky-object.js
index b79fa8017c45f93e7d3d9e8ee5dfc3cb1da7d254..323eddd18d94b907df769d7216a8fdd9cf025e88 100644
--- a/src/components/sticky-object.js
+++ b/src/components/sticky-object.js
@@ -46,10 +46,11 @@ AFRAME.registerComponent("sticky-object", {
     }
   },
 
-  _onRelease() {
+  _onRelease(evt) {
     if (
       this.data.autoLockOnRelease &&
-      this.el.body.velocity.lengthSquared() < this.data.autoLockSpeedLimit * this.data.autoLockSpeedLimit
+      this.el.body.velocity.lengthSquared() < this.data.autoLockSpeedLimit * this.data.autoLockSpeedLimit &&
+      evt.detail.target.components.grabbable.grabbers.length === 0
     ) {
       this.setLocked(true);
     }