diff --git a/Content.Server/LifeDrainer/LifeDrainerSystem.cs b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
index 2dd3d360c6..900438ff71 100644
--- a/Content.Server/LifeDrainer/LifeDrainerSystem.cs
+++ b/Content.Server/LifeDrainer/LifeDrainerSystem.cs
@@ -69,7 +69,7 @@ private void OnDrain(Entity<LifeDrainerComponent> ent, ref LifeDrainDoAfterEvent
                 _faction.AggroEntity(uid, puller);
 
             // someone pulled me away
-            if (TryComp<PullableComponent>(ent, out pullable) && pullable.Puller is {} selfPuller)
+            if (TryComp(ent, out pullable) && pullable.Puller is {} selfPuller)
                 _faction.AggroEntity(uid, selfPuller);
 
             // someone carried the psionic away
@@ -119,7 +119,7 @@ public bool TryDrain(Entity<LifeDrainerComponent> ent, EntityUid target)
         var ev = new LifeDrainDoAfterEvent();
         var args = new DoAfterArgs(EntityManager, uid, comp.Delay, ev, target: target, eventTarget: uid)
         {
-            BreakOnTargetMove = false, // If someone drags the target away, we still give the wisp a chance to consume it. This should still respect the distance threshold.
+            BreakOnTargetMove = true,
             BreakOnUserMove = true,
             MovementThreshold = 2f,
             NeedHand = false