diff --git a/src/p_user.c b/src/p_user.c
index 0b7325695..0e498e4f8 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4238,7 +4238,6 @@ void P_PlayerThink(player_t *player)
 
 	// Track airtime
 	if (P_IsObjectOnGround(player->mo)
-		&& !(player->pflags & PF_FAULT)
 		&& !P_PlayerInPain(player)) // This isn't airtime, but it's control loss all the same.
 	{
 		player->lastairtime = player->airtime;
@@ -4249,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