diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp
index ced5c83b08..582c636a7a 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -65,9 +65,6 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
             gotLock = withTryWriteLock([&]{
                     if (_positionalTarget != position || _rotationalTarget != rotation) {
                         auto ownerEntity = _ownerEntity.lock();
-                        if (ownerEntity) {
-                            ownerEntity->setActionDataDirty(true);
-                        }
                         _positionalTarget = position;
                         _rotationalTarget = rotation;
                     }
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 6be9938aff..5cfdd4125f 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -280,11 +280,6 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
     }
 
     _lastStep = simulationStep;
-
-    if (_entity->shouldSuppressEdits()) {
-        return false;
-    }
-
     if (glm::length2(_serverVelocity) > 0.0f) {
         _serverVelocity += _serverAcceleration * dt;
         _serverVelocity *= powf(1.0f - _body->getLinearDamping(), dt);
@@ -296,6 +291,10 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
         return true;
     }
 
+    if (_entity->shouldSuppressEdits()) {
+        return false;
+    }
+
     // Else we measure the error between current and extrapolated transform (according to expected behavior
     // of remote EntitySimulation) and return true if the error is significant.