diff --git a/Content.Client/MobState/DamageStateVisualizerSystem.cs b/Content.Client/MobState/DamageStateVisualizerSystem.cs
index e73d56c2aa11..bdb8466f3440 100644
--- a/Content.Client/MobState/DamageStateVisualizerSystem.cs
+++ b/Content.Client/MobState/DamageStateVisualizerSystem.cs
@@ -33,11 +33,14 @@ protected override void OnAppearanceChange(EntityUid uid, DamageStateVisualsComp
         // Brain no worky rn so this was just easier.
         foreach (var layer in sprite.AllLayers)
         {
-            layer.Visible = false;
+            sprite.LayerSetVisible(layer, false);
         }
 
         foreach (var (key, state) in layers)
         {
+            // Inheritance moment.
+            if (!sprite.LayerMapTryGet(key, out _)) continue;
+
             sprite.LayerSetVisible(key, true);
             sprite.LayerSetState(key, state);
         }