diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 166ce00be24..7c5defcc884 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -76,9 +76,8 @@ protected override void Draw(in OverlayDrawArgs args)
                 continue;
             }
 
-            GetStatusIconsEvent @event = new GetStatusIconsEvent();
-            if (@event.InContainer || @event.HasStealthComponent)
-            { 
+            if (_entManager.TryGetComponent<StealthComponent>(uid, out var comp) && comp.Enabled)
+            {
                 continue;
             }