diff --git a/src/k_kart.c b/src/k_kart.c
index 93c229f4a..fd0c24d5a 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8855,11 +8855,7 @@ void K_SetRespawnAtNextWaypoint(player_t *player)
 	}
 
 	// If the player's current and next waypoint is safe, carry on as usual
-	if (player->currentwaypoint &&
-		player->nextwaypoint &&
-		player->nextwaypoint->mobj &&
-		K_SafeRespawnPosition(player->nextwaypoint->mobj)
-	)
+	if (player->currentwaypoint && (K_SafeRespawnWaypoint(nextwp) || K_GetWaypointIsFinishline(nextwp)))
 	{
 		previouswp = player->currentwaypoint;
 		nextwp   = player->nextwaypoint;