diff --git a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
index 93871ede55..d31b9169e4 100644
--- a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
@@ -79,9 +79,17 @@ namespace Content.Client.GameObjects.EntitySystems
             weaponArcAnimation.SetData(weaponArc, msg.Angle);
 
 
-            foreach (var hitEntity in msg.Hits.Select(u => EntityManager.GetEntity(u)))
+            foreach (var uid in msg.Hits)
             {
-                if (!hitEntity.TryGetComponent(out ISpriteComponent sprite)) continue;
+                if (!EntityManager.TryGetEntity(uid, out var hitEntity))
+                {
+                    continue;
+                }
+
+                if (!hitEntity.TryGetComponent(out ISpriteComponent sprite))
+                {
+                    continue;
+                }
 
                 var originalColor = sprite.Color;
                 var newColor = Color.Red * originalColor;