diff --git a/src/g_demo.c b/src/g_demo.c
index 632947291..7026c3391 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -1492,10 +1492,7 @@ void G_BeginRecording(void)
 	demo_p += 16;
 
 	// Skin
-	const char *skinname = cv_skin.string;
-	if (pickedchar >= 0 && pickedchar < numskins)
-		skinname = skins[pickedchar].name;
-
+	const char *skinname = skins[players[0].skin].name;
 	for (i = 0; i < 16 && skinname[i]; i++)
 		name[i] = skinname[i];
 	for (; i < 16; i++)
diff --git a/src/m_menu.c b/src/m_menu.c
index e2866f32b..629f53d24 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10372,8 +10372,6 @@ static void M_ChooseNightsAttack(INT32 choice)
 	sprintf(gpath,"replay"PATHSEP"%s"PATHSEP"%s", timeattackfolder, G_BuildMapName(cv_nextmap.value));
 	snprintf(nameofdemo, sizeof nameofdemo, "%s-%s-last", gpath, skins[cv_chooseskin.value-1].name);
 
-	pickedchar = cv_chooseskin.value-1;
-
 	if (!cv_autorecord.value)
 		remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo));
 	else
@@ -10403,8 +10401,6 @@ static void M_ChooseTimeAttack(INT32 choice)
 	sprintf(gpath,"replay"PATHSEP"%s"PATHSEP"%s", timeattackfolder, G_BuildMapName(cv_nextmap.value));
 	snprintf(nameofdemo, sizeof nameofdemo, "%s-%s-last", gpath, skins[cv_chooseskin.value-1].name);
 
-	pickedchar = cv_chooseskin.value-1;
-
 	if (!cv_autorecord.value)
 		remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo));
 	else