diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 8b195aa46..27dd80043 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -8630,7 +8630,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 	K_ClearFinishBeamLine();
 
 	// Load the waypoints please!
-	if (gametyperules & GTR_CIRCUIT)
+	if (gametyperules & GTR_CIRCUIT && gamestate != GS_TITLESCREEN)
 	{
 		if (K_SetupWaypointList() == false)
 		{