diff --git a/src/k_kart.c b/src/k_kart.c
index 70f6e7dfe..f5cef8156 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -13476,7 +13476,7 @@ static void K_AirFailsafe(player_t *player)
 
 	// Accel inputs queue air-failsafe for when they're released,
 	// as long as they're not part of a fastfall attempt.
-	if ((buttons & (BT_ACCELERATE|BT_BRAKE)) == BT_ACCELERATE || K_GetForwardMove(player) != 0)
+	if ((buttons & (BT_ACCELERATE|BT_BRAKE)) == BT_ACCELERATE || K_GetForwardMove(player) != 0 || (player->fastfall && player->transfer))
 	{
 		player->pflags |= PF_AIRFAILSAFE;
 		return;