diff --git a/src/k_respawn.c b/src/k_respawn.c
index 21af8253d..144156fc6 100644
--- a/src/k_respawn.c
+++ b/src/k_respawn.c
@@ -295,7 +295,7 @@ void K_DoIngameRespawn(player_t *player)
 	player->respawn.init = true;
 	player->respawn.fast = true;
 	player->respawn.returnspeed = 0;
-	player->laps = player->lastsafelap;
+	player->laps = min(player->laps, player->lastsafelap);
 
 	player->respawn.airtimer = player->airtime;
 	player->respawn.truedeath = !!(player->pflags & PF_FAULT);