diff --git a/src/hacks/Warp.cpp b/src/hacks/Warp.cpp
index b740a1f5..d4ad0d83 100644
--- a/src/hacks/Warp.cpp
+++ b/src/hacks/Warp.cpp
@@ -358,12 +358,12 @@ void Warp(float accumulated_extra_samples, bool finalTick)
             {
                 choke_packet = false;
                 packets_sent = -1;
-                if (i == calls - 1)
-                    hacks::shared::aimbot::last_target_ignore_timer = tickcount + 5;
             }
             else
                 hooked_methods::UpdatePred();
 
+            if (in_rapidfire)
+                hacks::shared::aimbot::last_target_ignore_timer = tickcount + 12;
             original(accumulated_extra_samples, finalTick);
             // Only decrease ticks for the final CL_Move tick
             if (finalTick)