diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index f37a5a8bb6..25fd5e8412 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -155,10 +155,8 @@ namespace Content.Client.IconSmoothing
 
         private void OnAnchorChanged(EntityUid uid, IconSmoothComponent component, ref AnchorStateChangedEvent args)
         {
-            // Defer updating to next frame update. We do this because this unanchoring might be caused by a detach to
-            // null due to leaving PVS, in which case we can be a bit lazy. However, this event is raised before being
-            // sent to null-space, hence deferring.
-            _anchorChangedEntities.Enqueue(uid);
+            if (!args.Detaching)
+                _anchorChangedEntities.Enqueue(uid);
         }
 
         private void CalculateNewSprite(EntityUid uid,