diff --git a/engine/client/cl_font.c b/engine/client/cl_font.c
index c68c0a72..1d8547d2 100644
--- a/engine/client/cl_font.c
+++ b/engine/client/cl_font.c
@@ -368,8 +368,11 @@ void CL_DrawStringLen( cl_font_t *font, const char *s, int *width, int *height,
 		{
 			draw_len += font->charWidths[number];
 
-			if( draw_len > *width )
-				*width = draw_len;
+			if( width )
+			{
+				if( draw_len > *width )
+					*width = draw_len;
+			}
 		}
 
 		s++;