diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 31e615249c..c722336ca2 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -38,7 +38,8 @@ void EntityMotionState::enqueueOutgoingEntity(EntityItem* entity) {
 EntityMotionState::EntityMotionState(EntityItem* entity) :
     _entity(entity),
     _accelerationNearlyGravityCount(0),
-    _shouldClaimSimulationOwnership(false)
+    _shouldClaimSimulationOwnership(false),
+    _movingStepsWithoutSimulationOwner(0)
 {
     _type = MOTION_STATE_TYPE_ENTITY;
     assert(entity != NULL);
@@ -116,6 +117,12 @@ void EntityMotionState::setWorldTransform(const btTransform& worldTrans) {
 
     if (_entity->getSimulatorID().isNull() && isMoving()) {
         // object is moving and has no owner.  attempt to claim simulation ownership.
+        _movingStepsWithoutSimulationOwner++;
+    } else {
+        _movingStepsWithoutSimulationOwner = 0;
+    }
+
+    if (_movingStepsWithoutSimulationOwner > 4) { // XXX maybe meters from our characterController ?
         setShouldClaimSimulationOwnership(true);
     }
 
diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h
index 07f82aaa42..087d5b49b9 100644
--- a/libraries/physics/src/EntityMotionState.h
+++ b/libraries/physics/src/EntityMotionState.h
@@ -74,6 +74,7 @@ protected:
     EntityItem* _entity;
     quint8 _accelerationNearlyGravityCount;
     bool _shouldClaimSimulationOwnership;
+    quint32 _movingStepsWithoutSimulationOwner;
 };
 
 #endif // hifi_EntityMotionState_h