diff --git a/src/p_setup.c b/src/p_setup.c
index fbb171e6f..86c7adb48 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -7771,7 +7771,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 	K_ClearWaypoints();
 
 	// Load the waypoints please!
-	if (gametyperules & GTR_CIRCUIT)
+	if (gametyperules & GTR_CIRCUIT && gamestate != GS_TITLESCREEN)
 	{
 		if (numbosswaypoints == 0)
 		{