diff --git a/src/pilot.c b/src/pilot.c
index 0746945..c015a68 100644
--- a/src/pilot.c
+++ b/src/pilot.c
@@ -432,7 +432,9 @@ void pilot_hit(Pilot* p, const Solid* w, const unsigned int shooter,
   /* Calculate the damage. */
   outfit_calcDamage(&damage_shield, &damage_armour, &knockback,  dtype, damage);
 
-  if(p->id == PLAYER_ID)
+  if((p->id == PLAYER_ID) &&
+      !pilot_isFlag(player, PILOT_HYP_BEGIN) &&
+      !pilot_isFlag(player, PILOT_HYPERSPACE))
   	player_abortAutonav("Sustaining Damage");
 
   if(p->shield - damage_shield > 0.) { /* Shields take the whole blow. */