diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index e3396d74a2..e9e0846340 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -7,6 +7,7 @@ namespace Content.Client.Singularity.Systems;
 public sealed class EmitterSystem : SharedEmitterSystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -22,7 +23,7 @@ public sealed class EmitterSystem : SharedEmitterSystem
         if (!_appearance.TryGetData<EmitterVisualState>(uid, EmitterVisuals.VisualState, out var state, args.Component))
             state = EmitterVisualState.Off;
 
-        if (!args.Sprite.LayerMapTryGet(EmitterVisualLayers.Lights, out var layer))
+        if (!_sprite.LayerMapTryGet((uid, args.Sprite), EmitterVisualLayers.Lights, out var layer, false))
             return;
 
         switch (state)
@@ -30,17 +31,17 @@ public sealed class EmitterSystem : SharedEmitterSystem
             case EmitterVisualState.On:
                 if (component.OnState == null)
                     break;
-                args.Sprite.LayerSetVisible(layer, true);
-                args.Sprite.LayerSetState(layer, component.OnState);
+                _sprite.LayerSetVisible((uid, args.Sprite), layer, true);
+                _sprite.LayerSetRsiState((uid, args.Sprite), layer, component.OnState);
                 break;
             case EmitterVisualState.Underpowered:
                 if (component.UnderpoweredState == null)
                     break;
-                args.Sprite.LayerSetVisible(layer, true);
-                args.Sprite.LayerSetState(layer, component.UnderpoweredState);
+                _sprite.LayerSetVisible((uid, args.Sprite), layer, true);
+                _sprite.LayerSetRsiState((uid, args.Sprite), layer, component.UnderpoweredState);
                 break;
             case EmitterVisualState.Off:
-                args.Sprite.LayerSetVisible(layer, false);
+                _sprite.LayerSetVisible((uid, args.Sprite), layer, false);
                 break;
             default:
                 throw new ArgumentOutOfRangeException();