diff --git a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
index 7744746ee1..5f8113185f 100644
--- a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
@@ -1,10 +1,11 @@
-using Content.Server.Fluids.EntitySystems;
+using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Slippery;
 using Content.Shared.StepTrigger;
+using Content.Shared.StepTrigger.Components;
 using Content.Shared.StepTrigger.Systems;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
@@ -24,18 +25,21 @@ namespace Content.Server.Chemistry.TileReactions
         {
             if (reactVolume < 5) return FixedPoint2.Zero;
 
+            var entityManager = IoCManager.Resolve<IEntityManager>();
+
             // TODO Make this not puddle smear.
-            var puddle = EntitySystem.Get<SpillableSystem>()
+            var puddle = entityManager.EntitySysManager.GetEntitySystem<SpillableSystem>()
                 .SpillAt(tile, new Solution(reagent.ID, reactVolume), "PuddleSmear", _overflow, false, true);
 
             if (puddle != null)
             {
-                var entityManager = IoCManager.Resolve<IEntityManager>();
-                var slippery = entityManager.GetComponent<SlipperyComponent>(puddle.Owner);
+                var slippery = entityManager.EnsureComponent<SlipperyComponent>(puddle.Owner);
                 slippery.LaunchForwardsMultiplier = _launchForwardsMultiplier;
-                EntitySystem.Get<StepTriggerSystem>().SetRequiredTriggerSpeed(puddle.Owner, _requiredSlipSpeed);
                 slippery.ParalyzeTime = _paralyzeTime;
 
+                var step = entityManager.EnsureComponent<StepTriggerComponent>(puddle.Owner);
+                entityManager.EntitySysManager.GetEntitySystem<StepTriggerSystem>().SetRequiredTriggerSpeed(puddle.Owner, _requiredSlipSpeed, step);
+
                 return reactVolume;
             }