diff --git a/src/g_game.c b/src/g_game.c
index ef9b54f3c..a604c1c7b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5898,7 +5898,10 @@ void G_GetBackupCupData(boolean actuallygetdata)
 	P_GetBackupCupData(&save);
 
 	if (cv_dummygpdifficulty.value != cupsavedata.difficulty
-	|| !!cv_dummygpencore.value != cupsavedata.encore)
+#if 0 // TODO: encore GP
+	|| !!cv_dummygpencore.value != cupsavedata.encore
+#endif
+	)
 	{
 		// Still not compatible.
 		cupsavedata.cup = NULL;
diff --git a/src/menus/transient/cup-select.c b/src/menus/transient/cup-select.c
index 8df28af4c..7882d0cc9 100644
--- a/src/menus/transient/cup-select.c
+++ b/src/menus/transient/cup-select.c
@@ -83,7 +83,13 @@ static void M_StartCup(UINT8 entry)
 
 		// Populate the roundqueue
 		memset(&roundqueue, 0, sizeof(struct roundqueue));
-		G_GPCupIntoRoundQueue(levellist.levelsearch.cup, levellist.newgametype, (boolean)cv_dummygpencore.value);
+		G_GPCupIntoRoundQueue(levellist.levelsearch.cup, levellist.newgametype,
+#if 0 // TODO: encore GP
+			(boolean)cv_dummygpencore.value
+#else
+			false
+#endif
+		);
 		roundqueue.position = roundqueue.roundnum = 1;
 		roundqueue.netcommunicate = true; // relevant for future Online GP
 	}