diff --git a/src/k_kart.c b/src/k_kart.c
index d26eca203..269cab338 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -9669,6 +9669,14 @@ void K_UpdateDistanceFromFinishLine(player_t *const player)
 		waypoint_t *finishline   = K_GetFinishLineWaypoint();
 		waypoint_t *nextwaypoint = NULL;
 
+		if (player->respawn.state == RESPAWNST_MOVE &&
+			player->respawn.init == true &&
+			player->lastsafelap < player->laps)
+		{
+			player->laps = player->lastsafelap;
+			player->cheatchecknum = player->lastsafecheatcheck;
+		}
+
 		if (player->spectator)
 		{
 			// Don't update waypoints while spectating
diff --git a/src/k_respawn.c b/src/k_respawn.c
index 058052d8e..3fd1283ca 100644
--- a/src/k_respawn.c
+++ b/src/k_respawn.c
@@ -318,12 +318,6 @@ void K_DoIngameRespawn(player_t *player)
 	player->respawn.fast = true;
 	player->respawn.returnspeed = 0;
 
-	if (player->lastsafelap < player->laps)
-	{
-		player->laps = player->lastsafelap;
-		player->cheatchecknum = player->lastsafecheatcheck;
-	}
-
 	player->respawn.airtimer = player->airtime;
 	player->respawn.truedeath = !!(player->pflags & PF_FAULT);