diff --git a/Robust.Shared/GameObjects/EntityManager.cs b/Robust.Shared/GameObjects/EntityManager.cs
index 49380916a..2bb03819f 100644
--- a/Robust.Shared/GameObjects/EntityManager.cs
+++ b/Robust.Shared/GameObjects/EntityManager.cs
@@ -369,6 +369,9 @@ namespace Robust.Shared.GameObjects
             if (component.LifeStage >= ComponentLifeStage.Removing || !component.NetSyncEnabled)
                 return;
 
+            if (component.LastModifiedTick == CurrentTick)
+                return;
+
             DirtyEntity(uid, meta);
             component.LastModifiedTick = CurrentTick;
         }
@@ -382,6 +385,9 @@ namespace Robust.Shared.GameObjects
             if (ent.Comp.LifeStage >= ComponentLifeStage.Removing || !ent.Comp.NetSyncEnabled)
                 return;
 
+            if (ent.Comp.LastModifiedTick == CurrentTick)
+                return;
+
             DirtyEntity(ent, meta);
             ent.Comp.LastModifiedTick = CurrentTick;
         }