diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 9453e128e..d5e336709 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -6224,7 +6224,7 @@ static void M_DrawStatsChars(void)
 	V_DrawThinString(20, y - 10, highlightflags, "CHARACTER");
 	V_DrawRightAlignedThinString(BASEVIDWIDTH/2 + 34, y - 10, highlightflags, "WINS");
 
-	while ((skin = statisticsmenu.maplist[++i]) != NEXTMAP_INVALID)
+	while ((skin = statisticsmenu.maplist[++i]) < numskins)
 	{
 		if (location)
 		{
diff --git a/src/menus/extras-statistics.c b/src/menus/extras-statistics.c
index 74a93e6b2..bc2cbd5b8 100644
--- a/src/menus/extras-statistics.c
+++ b/src/menus/extras-statistics.c
@@ -138,7 +138,7 @@ static void M_StatisticsChars(void)
 		}
 	}
 
-	statisticsmenu.maplist[statisticsmenu.nummaps] = NEXTMAP_INVALID;
+	statisticsmenu.maplist[statisticsmenu.nummaps] = MAXSKINS;
 
 	statisticsmenu.location = 0;
 	statisticsmenu.maxscroll = statisticsmenu.nummaps - 6;