diff --git a/libs/util/info.c b/libs/util/info.c
index cc1bd5f1e..a46a9c441 100644
--- a/libs/util/info.c
+++ b/libs/util/info.c
@@ -120,7 +120,8 @@ Info_SetValueForStarKey (info_t *info, const char *key, const char *value, int f
 		cursize -= strlen (k->key) + 1;
 		cursize -= strlen (k->value) + 1;
 	}
-	if (cursize + strlen (key) + 1 + strlen (value) + 1 > info->maxsize) {
+	if (info->maxsize &&
+		cursize + strlen (key) + 1 + strlen (value) + 1 > info->maxsize) {
 		Sys_Printf ("Info string length exceeded\n");
 		return;
 	}
diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c
index 59311f6da..d4e533d2f 100644
--- a/qw/source/sv_main.c
+++ b/qw/source/sv_main.c
@@ -2362,7 +2362,7 @@ SV_Init (void)
 	Sys_Init ();
 
 	svs.info = Info_ParseString ("", MAX_SERVERINFO_STRING);
-	localinfo = Info_ParseString ("", MAX_LOCALINFO_STRING);
+	localinfo = Info_ParseString ("", 0);	// unlimited
 
 	Cbuf_Init ();
 	Cmd_Init ();