diff --git a/src/k_kart.c b/src/k_kart.c
index 0444d3c11..e65e68945 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -10858,7 +10858,7 @@ void K_UpdateAllPlayerPositions(void)
 
 		if (player->respawn.state == RESPAWNST_MOVE &&
 			player->respawn.init == true &&
-			player->lastsafelap < player->laps)
+			player->lastsafelap != player->laps)
 		{
 			player->laps = player->lastsafelap;
 			player->cheatchecknum = player->lastsafecheatcheck;
diff --git a/src/p_spec.c b/src/p_spec.c
index 41b0f4841..0eae90798 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -1911,6 +1911,8 @@ static void K_HandleLapIncrement(player_t *player)
 {
 	if (player)
 	{
+		if (player->respawn.state == RESPAWNST_MOVE)
+			return;
 		if (!G_TimeAttackStart() && leveltime < starttime && !(gametyperules & GTR_ROLLINGSTART))
 		{
 			// freeze 'em until fault penalty is over