diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java
index eb6e2c4b0..5f3e92838 100644
--- a/src/main/java/baritone/behavior/ElytraBehavior.java
+++ b/src/main/java/baritone/behavior/ElytraBehavior.java
@@ -333,8 +333,10 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
         this.aimPos = null;
         this.remainingFireworkTicks = 0;
         this.remainingSetBackTicks = 0;
-        this.solver.cancel(true);
-        this.solver = null;
+        if (this.solver != null) {
+            this.solver.cancel(true);
+            this.solver = null;
+        }
     }
 
     @Override