diff --git a/Content.Server/Audio/AmbientSoundSystem.cs b/Content.Server/Audio/AmbientSoundSystem.cs
index 8c5d157d34..b148053ff4 100644
--- a/Content.Server/Audio/AmbientSoundSystem.cs
+++ b/Content.Server/Audio/AmbientSoundSystem.cs
@@ -16,7 +16,7 @@ namespace Content.Server.Audio
 
         private void HandlePowerSupply(EntityUid uid, AmbientOnPoweredComponent component, PowerNetBatterySupplyEvent args)
         {
-            if (!ComponentManager.TryGetComponent<AmbientSoundComponent>(uid, out var ambientSound)) return;
+            if (!EntityManager.TryGetComponent<AmbientSoundComponent>(uid, out var ambientSound)) return;
             if (ambientSound.Enabled == args.Supply) return;
             ambientSound.Enabled = args.Supply;
             ambientSound.Dirty();
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index a9c883830d..5a89923ea5 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -154,7 +154,7 @@ namespace Content.Server.Power.EntitySystems
 
             // Setup for events.
             {
-                foreach (var powerNetBattery in ComponentManager.EntityQuery<PowerNetworkBatteryComponent>())
+                foreach (var powerNetBattery in EntityManager.EntityQuery<PowerNetworkBatteryComponent>())
                 {
                     _lastSupply[powerNetBattery] = powerNetBattery.CurrentSupply;
                 }
@@ -218,7 +218,7 @@ namespace Content.Server.Power.EntitySystems
                     }
                 }
 
-                foreach (var powerNetBattery in ComponentManager.EntityQuery<PowerNetworkBatteryComponent>())
+                foreach (var powerNetBattery in EntityManager.EntityQuery<PowerNetworkBatteryComponent>())
                 {
                     if (!_lastSupply.TryGetValue(powerNetBattery, out var lastPowerSupply))
                     {