diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index d186455e..f100b826 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2561,7 +2561,7 @@ void Com_Init( char *commandLine ) {
 
   // get dedicated here for proper hunk megs initialization
 #ifdef DEDICATED
-	com_dedicated = Cvar_Get ("dedicated", "1", CVAR_LATCH);
+	com_dedicated = Cvar_Get ("dedicated", "1", CVAR_INIT);
 #else
 	com_dedicated = Cvar_Get ("dedicated", "0", CVAR_LATCH);
 #endif
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 97154f0f..28b3a1d4 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -656,10 +656,6 @@ void SV_Init (void) {
 	sv_pure = Cvar_Get ("sv_pure", "1", CVAR_SYSTEMINFO );
 #if USE_VOIP
 	sv_voip = Cvar_Get ("sv_voip", "1", CVAR_SYSTEMINFO | CVAR_LATCH);
-	if ( (sv_voip->integer < 0) || (sv_voip->integer > 1) ) {
-		Com_Printf("WARNING: sv_voip must be 0 or 1. Setting to 1.");
-		Cvar_Set ("sv_voip", "1");
-	}
 #endif
 	Cvar_Get ("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM );
 	Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index e17bd6ae..667db41b 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -782,14 +782,6 @@ void SV_Frame( int msec ) {
 		return;
 	}
 
-#ifdef DEDICATED
-	if( com_dedicated->integer == 0 )
-	{
-		Com_Printf( "WARNING: dedicated must not be 0. Setting to 1.\n" );
-		Cvar_Set( "dedicated", "1" );
-	}
-#endif
-
 	if (!com_sv_running->integer)
 	{
 		// Running as a server, but no map loaded