diff --git a/code/renderercommon/tr_font.c b/code/renderercommon/tr_font.c
index 3f830d5c..e2e94f13 100644
--- a/code/renderercommon/tr_font.c
+++ b/code/renderercommon/tr_font.c
@@ -503,7 +503,8 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
 			xOut = 0;
 			yOut = 0;
 			ri.Free(imageBuff);
-			i++;
+			if(i == GLYPH_END)
+				i++;
 		} else {
 			Com_Memcpy(&font->glyphs[i], glyph, sizeof(glyphInfo_t));
 			i++;