diff --git a/src/main/java/baritone/process/ElytraProcess.java b/src/main/java/baritone/process/ElytraProcess.java
index 754587a47..1ab9f74f5 100644
--- a/src/main/java/baritone/process/ElytraProcess.java
+++ b/src/main/java/baritone/process/ElytraProcess.java
@@ -81,8 +81,10 @@ public class ElytraProcess extends BaritoneProcessHelper implements IBaritonePro
     public void resetState() {
         BlockPos destination = this.currentDestination();
         this.onLostControl();
-        this.pathTo(destination);
-        this.repackChunks();
+        if (destination != null) {
+            this.pathTo(destination);
+            this.repackChunks();
+        }
     }
 
     @Override