diff --git a/src/components/sticky-object.js b/src/components/sticky-object.js
index 61d04814a95b2e30cc79743a039dec1c0a6d5235..4d05f0f53d3a16cb27c1e22b11de6f4992a09d87 100644
--- a/src/components/sticky-object.js
+++ b/src/components/sticky-object.js
@@ -5,7 +5,7 @@ AFRAME.registerComponent("sticky-object", {
   schema: {
     autoLockOnLoad: { default: false },
     autoLockOnRelease: { default: false },
-    autoLockSpeedLimit: { default: 0.25 }
+    autoLockSpeedLimit: { default: 0.5 }
   },
 
   init() {
@@ -52,7 +52,8 @@ AFRAME.registerComponent("sticky-object", {
 
     if (
       this.data.autoLockOnRelease &&
-      this.el.body.velocity.lengthSquared() < this.data.autoLockSpeedLimit * this.data.autoLockSpeedLimit
+      (this.data.autoLockSpeedLimit === 0 ||
+        this.el.body.velocity.lengthSquared() < this.data.autoLockSpeedLimit * this.data.autoLockSpeedLimit)
     ) {
       this.setLocked(true);
     }
diff --git a/src/hub.html b/src/hub.html
index e9533ed12e1632d65c796da95906092b17a0f2aa..69c250d2511b94dd15d476822b51d99e97ab719f 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -167,7 +167,7 @@
                     super-networked-interactable="counter: #pen-counter;"
                     body="type: dynamic; shape: none; mass: 1;"
                     grabbable="maxGrabbers: 1"
-                    sticky-object="autoLockOnRelease: true; autoLockOnLoad: true;"
+                    sticky-object="autoLockOnRelease: true; autoLockOnLoad: true; autoLockSpeedLimit: 0;"
                     hoverable
                     scale="0.5 0.5 0.5"
                 >
@@ -197,7 +197,7 @@
                     camera-tool
                     body="type: dynamic; shape: none; mass: 1;"
                     shape="shape: box; halfExtents: 0.22 0.145 0.1; offset: 0 0.02 0"
-                    sticky-object="autoLockOnRelease: true; autoLockOnLoad: true;"
+                    sticky-object="autoLockOnRelease: true; autoLockOnLoad: true; autoLockSpeedLimit: 0;"
                     super-networked-interactable="counter: #camera-counter;"
                     position-at-box-shape-border="target:.delete-button"
                     rotation