diff --git a/Content.Client/HealthOverlay/HealthOverlaySystem.cs b/Content.Client/HealthOverlay/HealthOverlaySystem.cs
index 70c2d659c7..cc987e7b55 100644
--- a/Content.Client/HealthOverlay/HealthOverlaySystem.cs
+++ b/Content.Client/HealthOverlay/HealthOverlaySystem.cs
@@ -88,7 +88,8 @@ namespace Content.Client.HealthOverlay
                 {
                     if (_guis.TryGetValue(entity.Uid, out var oldGui))
                     {
-                        oldGui.Dispose();
+                        _guis.Remove(entity.Uid);
+                        oldGui.Dispose();                       
                     }
 
                     continue;