diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 18239fccf..54de0adbe 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -7282,13 +7282,6 @@ void KartEncore_OnChange(void)
 void KartEliminateLast_OnChange(void);
 void KartEliminateLast_OnChange(void)
 {
-#ifndef DEVELOP
-	if (K_CanChangeRules(false) == false)
-	{
-		CV_StealthSet(&cv_karteliminatelast, cv_karteliminatelast.defaultvalue);
-	}
-#endif
-
 	P_CheckRacers();
 }
 
diff --git a/src/p_inter.c b/src/p_inter.c
index 55ec1a6fc..dc51f2d84 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1525,7 +1525,7 @@ boolean P_CheckRacers(void)
 {
 	const boolean griefed = (spectateGriefed > 0);
 
-	boolean eliminateLast = cv_karteliminatelast.value;
+	boolean eliminateLast = (!K_CanChangeRules(true) || (cv_karteliminatelast.value != 0));
 	boolean allHumansDone = true;
 	//boolean allBotsDone = true;