diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 6e487cbfe3..8449ce050b 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -189,7 +189,7 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
             } else {
                 simulationBlocked = senderID != entity->getSimulatorID();
             }
-            if (simulationBlocked) {
+            if (simulationBlocked || entity->shouldSuppressLocationEdits()) {
                 // squash ownership and physics-related changes.
                 properties.setSimulationOwnerChanged(false);
                 properties.setPositionChanged(false);