diff --git a/src/cvars.cpp b/src/cvars.cpp
index 417eefa08..46d27e5d8 100644
--- a/src/cvars.cpp
+++ b/src/cvars.cpp
@@ -531,7 +531,7 @@ consvar_t cv_masterserver_token = Server("masterserver_token", "");
 void MasterClient_Ticker(void);
 consvar_t cv_masterserver_update_rate = Server("masterserver_update_rate", "15").min_max(2, 60).onchange_noinit(MasterClient_Ticker);
 
-consvar_t cv_maxping = Server("maxdelay", "20").values(CV_Unsigned);
+consvar_t cv_maxping = Server("maxdelay", "20").min_max(0, 30);
 consvar_t cv_menujam = Server("menujam", "menu").values({{0, "menu"}, {1, "menu2"}, {2, "menu3"}});
 consvar_t cv_menujam_update = Server("menujam_update", "Off").on_off();
 consvar_t cv_netdemosyncquality = Server("netdemo_syncquality", "1").min_max(1, 35);
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 881b9b044..d402d7d9b 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -176,8 +176,6 @@ void M_ChangeCvarDirect(INT32 choice, consvar_t *cv)
 			choice *= (TICRATE/7);
 		else if (cv == &cv_maxsend)
 			choice *= 512;
-		else if (cv == &cv_maxping)
-			choice *= 50;
 
 		CV_AddValue(cv, choice);
 	}
diff --git a/src/menus/options-server-advanced.c b/src/menus/options-server-advanced.c
index 6c9a04a52..7488e2d33 100644
--- a/src/menus/options-server-advanced.c
+++ b/src/menus/options-server-advanced.c
@@ -22,10 +22,10 @@ menuitem_t OPTIONS_ServerAdvanced[] =
 	{IT_STRING | IT_CVAR, "Resynch. Attempts", "How many times to attempt sending data to desynchronized players.",
 		NULL, {.cvar = &cv_resynchattempts}, 0, 0},
 
-	{IT_STRING | IT_CVAR, "Ping Limit (ms)", "Players above the ping limit will get kicked from the server.",
+	{IT_STRING | IT_CVAR, "Delay Limit (tics)", "Players above the delay limit will get kicked from the server.",
 		NULL, {.cvar = &cv_maxping}, 0, 0},
 
-	{IT_STRING | IT_CVAR, "Ping Timeout (s)", "Players must be above the ping limit for this long before being kicked.",
+	{IT_STRING | IT_CVAR, "Delay Timeout (seconds)", "Players must be above the delay limit for this long before being kicked.",
 		NULL, {.cvar = &cv_pingtimeout}, 0, 0},
 
 	{IT_STRING | IT_CVAR, "Connection Timeout (tics)", "Players not giving any network activity for this long are kicked.",