diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 2c4efff7b..474b6196a 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -413,6 +413,10 @@ consvar_t cv_kartspeedometer = CVAR_INIT ("speedometer", "Percentage", CV_SAVE,
 consvar_t cv_kartvoices = CVAR_INIT ("tauntvoices", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL);
 consvar_t cv_karthorns = CVAR_INIT ("taunthorns", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL);
 
+#ifdef DEVELOP
+	consvar_t cv_kartencoremap = CVAR_INIT ("encoremap", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
+#endif
+
 static CV_PossibleValue_t kartbot_cons_t[] = {
 	{0, "Off"},
 	{1, "Lv.1"},
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index eb1e5232b..e282ce3a5 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -90,6 +90,9 @@ extern consvar_t cv_kartbot;
 extern consvar_t cv_karteliminatelast;
 extern consvar_t cv_thunderdome;
 extern consvar_t cv_kartusepwrlv;
+#ifdef DEVELOP
+	extern consvar_t cv_kartencoremap;
+#endif
 
 extern consvar_t cv_votetime;
 extern consvar_t cv_botscanvote;
diff --git a/src/k_kart.c b/src/k_kart.c
index 274ce9da6..2a13f8d75 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -386,6 +386,10 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_debugencorevote);
 
 	CV_RegisterVar(&cv_reducevfx);
+
+	#ifdef DEVELOP
+		CV_RegisterVar(&cv_kartencoremap);
+	#endif
 }
 
 //}
diff --git a/src/p_setup.c b/src/p_setup.c
index 75ac73f4c..f664d82e6 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -8177,7 +8177,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 
 	if (mapheaderinfo[gamemap-1])
 	{
-		if (encoremode)
+		if (encoremode && cv_kartencoremap.value)
 		{
 			encoreLump = vres_Find(curmapvirt, "ENCORE");
 		}