diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 26743b739..98e9c6e5a 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -514,10 +514,16 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
   */
 void D_RegisterServerCommands(void)
 {
+	int i;
 	Forceskin_cons_t[0].value = -1;
 	Forceskin_cons_t[0].strvalue = "Off";
-	Forceskin_cons_t[MAXSKINS].value = 0;
-	Forceskin_cons_t[MAXSKINS].strvalue = NULL;
+
+	// Set the values to 0/NULl, it will be overwritten later when a skin is assigned to the slot.
+	for (i = 1; i < MAXSKINS; i++)
+	{
+		Forceskin_cons_t[i].value = 0;
+		Forceskin_cons_t[i].strvalue = NULL;
+	}
 
 	RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
 	RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
diff --git a/src/r_things.c b/src/r_things.c
index f0acaae56..3ea5ebade 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -40,7 +40,7 @@ int	snprintf(char *str, size_t n, const char *fmt, ...);
 //int	vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
 #endif
 
-CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+1];
+CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2];
 
 static void R_InitSkins(void);