diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 452495cf18..fdd290bfca 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -186,6 +186,9 @@ PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
     }
 
     if (_entity->getLocked()) {
+        if (_entity->isMoving()) {
+            return MOTION_TYPE_KINEMATIC;
+        }
         return MOTION_TYPE_STATIC;
     }