diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index 826a1c0f2..d5d16ab49 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -5011,7 +5011,7 @@ static void K_drawKartStartCountdown(void)
 		return;
 	}
 
-	if (stplyr->karthud[khud_fault] != 0)
+	if (stplyr->karthud[khud_fault] != 0 && stplyr->karthud[khud_finish] == 0)
 	{
 		K_drawKartFinish(false);
 	}
diff --git a/src/k_kart.c b/src/k_kart.c
index f0e6bce0f..cff58da81 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8105,9 +8105,7 @@ void K_KartPlayerHUDUpdate(player_t *player)
 			player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time
 	}
 
-	if (player->exiting
-	&& (specialstageinfo.valid == false
-		|| !(player->pflags & PF_NOCONTEST)))
+	if (player->exiting && !(player->pflags & PF_NOCONTEST))
 	{
 		if (player->karthud[khud_finish] <= 2*TICRATE)
 			player->karthud[khud_finish]++;
diff --git a/src/p_inter.c b/src/p_inter.c
index fb39564ed..34c484150 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2526,7 +2526,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
 			return false;
 		}
 
-		if (modeattacking & ATTACKING_SPB)
+		if (modeattacking)
 		{
 			// Death in SPB Attack is an instant loss.
 			P_DoPlayerExit(player, PF_NOCONTEST);