diff --git a/src/api/java/baritone/api/process/ICustomGoalProcess.java b/src/api/java/baritone/api/process/ICustomGoalProcess.java
index 5084aff2f..2bae55ce3 100644
--- a/src/api/java/baritone/api/process/ICustomGoalProcess.java
+++ b/src/api/java/baritone/api/process/ICustomGoalProcess.java
@@ -38,6 +38,11 @@ public interface ICustomGoalProcess extends IBaritoneProcess {
      */
     Goal getGoal();
 
+    /**
+     * @return The most recent set goal, which doesn't invalidate upon {@link #onLostControl()}
+     */
+    Goal mostRecentGoal();
+
     /**
      * Sets the goal and begins the path execution.
      *
diff --git a/src/main/java/baritone/command/defaults/ElytraCommand.java b/src/main/java/baritone/command/defaults/ElytraCommand.java
index 93c4c2544..cd7034ef8 100644
--- a/src/main/java/baritone/command/defaults/ElytraCommand.java
+++ b/src/main/java/baritone/command/defaults/ElytraCommand.java
@@ -42,7 +42,7 @@ public class ElytraCommand extends Command {
     public void execute(String label, IArgConsumer args) throws CommandException {
         ICustomGoalProcess customGoalProcess = baritone.getCustomGoalProcess();
         args.requireMax(0);
-        Goal iGoal = customGoalProcess.getGoal();
+        Goal iGoal = customGoalProcess.mostRecentGoal();
         if (iGoal == null) {
             throw new CommandInvalidStateException("No goal has been set");
         }
diff --git a/src/main/java/baritone/process/CustomGoalProcess.java b/src/main/java/baritone/process/CustomGoalProcess.java
index ea9ff2092..71d212b38 100644
--- a/src/main/java/baritone/process/CustomGoalProcess.java
+++ b/src/main/java/baritone/process/CustomGoalProcess.java
@@ -36,6 +36,11 @@ public final class CustomGoalProcess extends BaritoneProcessHelper implements IC
      */
     private Goal goal;
 
+    /**
+     * The most recent goal. Not invalidated upon {@link #onLostControl()}
+     */
+    private Goal mostRecentGoal;
+
     /**
      * The current process state.
      *
@@ -50,6 +55,7 @@ public final class CustomGoalProcess extends BaritoneProcessHelper implements IC
     @Override
     public void setGoal(Goal goal) {
         this.goal = goal;
+        this.mostRecentGoal = goal;
         if (this.state == State.NONE) {
             this.state = State.GOAL_SET;
         }
@@ -68,6 +74,11 @@ public final class CustomGoalProcess extends BaritoneProcessHelper implements IC
         return this.goal;
     }
 
+    @Override
+    public Goal mostRecentGoal() {
+        return this.mostRecentGoal;
+    }
+
     @Override
     public boolean isActive() {
         return this.state != State.NONE;