diff --git a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
index 92cdf16b3c..8d73a4fa5a 100644
--- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
@@ -48,6 +48,13 @@ namespace Content.Client.GameObjects.EntitySystems
             _overlayManager.AddOverlay(new CombatModeOverlay(this));
         }
 
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _overlayManager.RemoveOverlay(nameof(CombatModeOverlay));
+        }
+
         private bool IsInCombatMode()
         {
             var entity = _playerManager.LocalPlayer.ControlledEntity;