diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 80f992d865..2cfb71df0c 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -2764,13 +2764,19 @@ bool EntityItem::getLocked() const {
 }
 
 void EntityItem::setLocked(bool value) { 
+    bool changed { false };
     withWriteLock([&] {
-        _locked = value;
+        if (_locked != value) {
+            _locked = value;
+            changed = true;
+        }
     });
-    markDirtyFlags(Simulation::DIRTY_MOTION_TYPE);
-    EntityTreePointer tree = getTree();
-    if (tree) {
-        tree->entityChanged(getThisPointer());
+    if (changed) {
+        markDirtyFlags(Simulation::DIRTY_MOTION_TYPE);
+        EntityTreePointer tree = getTree();
+        if (tree) {
+            tree->entityChanged(getThisPointer());
+        }
     }
 }