diff --git a/src/p_user.c b/src/p_user.c
index 9e811dc01..0e498e4f8 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4248,6 +4248,12 @@ void P_PlayerThink(player_t *player)
 		player->airtime++;
 	}
 
+	if ((player->pflags & PF_FAULT) || (player->pflags & PF_VOID))
+	{
+		player->lastairtime = 0;
+		player->airtime = 0;
+	}
+
 	cmd = &player->cmd;
 
 	// SRB2kart