diff --git a/src/objects/checkpoint.cpp b/src/objects/checkpoint.cpp
index 81b93feb0..195e1436a 100644
--- a/src/objects/checkpoint.cpp
+++ b/src/objects/checkpoint.cpp
@@ -584,7 +584,11 @@ void Obj_CheckpointThink(mobj_t* end)
 
 void Obj_CrossCheckpoints(player_t* player, fixed_t old_x, fixed_t old_y)
 {
-	if (player->exiting || player->laps == 0) // can't cross checkpoints when exiting, or before the first lap starts
+	if (player->exiting
+	|| (
+		(gametyperules & GTR_CIRCUIT)
+		&& (player->laps == 0)
+	))
 	{
 		return;
 	}