diff --git a/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs b/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs
index d42fffd6b6..2d7b8d3a62 100644
--- a/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs
+++ b/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs
@@ -18,7 +18,9 @@ public sealed class RevenantOverloadedLightsSystem : SharedRevenantOverloadedLig
     {
         base.Update(frameTime);
 
-        foreach (var (comp, light) in  EntityQuery<RevenantOverloadedLightsComponent, PointLightComponent>())
+        var enumerator = EntityQueryEnumerator<RevenantOverloadedLightsComponent, PointLightComponent>();
+
+        while (enumerator.MoveNext(out var comp, out var light))
         {
             //this looks cool :HECK:
             light.Energy = 2f * Math.Abs((float) Math.Sin(0.25 * Math.PI * comp.Accumulator));
diff --git a/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs b/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs
index 1b3be0a820..4cb5b9dc96 100644
--- a/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs
+++ b/Content.Shared/Revenant/EntitySystems/SharedRevenantOverloadedLightsSystem.cs
@@ -11,11 +11,12 @@ public abstract class SharedRevenantOverloadedLightsSystem : EntitySystem
     {
         base.Update(frameTime);
 
-        foreach (var comp in EntityQuery<RevenantOverloadedLightsComponent>())
+        var enumerator = EntityQueryEnumerator<RevenantOverloadedLightsComponent>();
+
+        while (enumerator.MoveNext(out var comp))
         {
             comp.Accumulator += frameTime;
 
-
             if (comp.Accumulator < comp.ZapDelay)
                 continue;
 
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index 495a321fad..333b328284 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -31,7 +31,9 @@ namespace Content.Shared.StatusEffect
             base.Update(frameTime);
 
             var curTime = _gameTiming.CurTime;
-            foreach (var (_, status) in EntityManager.EntityQuery<ActiveStatusEffectsComponent, StatusEffectsComponent>())
+            var enumerator = EntityQueryEnumerator<ActiveStatusEffectsComponent, StatusEffectsComponent>();
+
+            while (enumerator.MoveNext(out _, out var status))
             {
                 foreach (var state in status.ActiveEffects.ToArray())
                 {
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index bf08b7c915..d4614fe565 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -21,7 +21,9 @@ public sealed class StepTriggerSystem : EntitySystem
     public override void Update(float frameTime)
     {
         var query = GetEntityQuery<PhysicsComponent>();
-        foreach (var (active, trigger, transform) in EntityQuery<StepTriggerActiveComponent, StepTriggerComponent, TransformComponent>())
+        var enumerator = EntityQueryEnumerator<StepTriggerActiveComponent, StepTriggerComponent, TransformComponent>();
+
+        while (enumerator.MoveNext(out var active, out var trigger, out var transform))
         {
             if (!Update(trigger, transform, query))
                 continue;