diff --git a/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java b/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java
index 504a9e40..21d5fdfc 100644
--- a/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java
+++ b/src/main/java/baritone/bot/behavior/impl/PathingBehavior.java
@@ -56,7 +56,12 @@ public class PathingBehavior extends Behavior {
 
     @Override
     public void onTick(TickEvent event) {
-        if (event.getType() == TickEvent.Type.OUT || current == null) {
+        if (event.getType() == TickEvent.Type.OUT) {
+            current = null;
+            next = null;
+            return;
+        }
+        if (current == null) {
             return;
         }
         boolean safe = current.onTick(event);