diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 40da6e01d4c..608d5a72756 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -594,7 +594,7 @@ makebreak:
 		
 		if (vfont == NULL) break;
 
-		if (i != slen) {
+		if (!ELEM(ascii, '\n', '\0')) {
 			che = find_vfont_char(vfd, ascii);
 
 			/*
@@ -606,6 +606,9 @@ makebreak:
 				che = BLI_vfontchar_from_freetypefont(vfont, ascii);
 			}
 		}
+		else {
+			che = NULL;
+		}
 
 		/* No VFont found */
 		if (vfont == NULL) {