diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 369118dcc..bce1a28ef 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1288,8 +1288,13 @@ static void SendNameAndColor(void)
 				SetPlayerSkin(consoleplayer, cv_skin.string);
 			}
 		}
-		else
+		else if (pickedchar != -1)
+		{
 			SetPlayerSkinByNum(consoleplayer, pickedchar);
+			pickedchar = -1;
+		}
+		else
+			SetPlayerSkin(consoleplayer, cv_skin.string);
 		return;
 	}