diff --git a/src/player.c b/src/player.c
index 87b87c1..27bbef9 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1491,6 +1491,11 @@ void player_abortAutonav(void) {
   if(player_isFlag(PLAYER_AUTONAV)) {
     player_message("Autonav aborted!");
     player_rmFlag(PLAYER_AUTONAV);
+    if(pilot_isFlag(player, PILOT_HYP_PREP)) {
+      pilot_hyperspaceAbort(player);
+      player_message("Aborting hyperspace sequence.");
+      return;
+    }
   }
 }