diff --git a/Content.Client/PowerCell/PowerCellSystem.cs b/Content.Client/PowerCell/PowerCellSystem.cs
index 9776429eb2..eb4e338e78 100644
--- a/Content.Client/PowerCell/PowerCellSystem.cs
+++ b/Content.Client/PowerCell/PowerCellSystem.cs
@@ -15,17 +15,21 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
 
     private void OnPowerCellVisualsChange(EntityUid uid, PowerCellVisualsComponent component, ref AppearanceChangeEvent args)
     {
-        if (args.Sprite == null) return;
+        if (args.Sprite == null)
+            return;
+
+        if (!args.Sprite.TryGetLayer((int) PowerCellVisualLayers.Unshaded, out var unshadedLayer))
+            return;
 
         if (args.Component.TryGetData(PowerCellVisuals.ChargeLevel, out byte level))
         {
             if (level == 0)
             {
-                args.Sprite.LayerSetVisible(PowerCellVisualLayers.Unshaded, false);
+                unshadedLayer.Visible = false;
                 return;
             }
 
-            args.Sprite.LayerSetVisible(PowerCellVisualLayers.Unshaded, true);
+            unshadedLayer.Visible = true;
             args.Sprite.LayerSetState(PowerCellVisualLayers.Unshaded, $"o{level}");
         }
     }