diff --git a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
index 253c7075fa..7d4fac337d 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextCharacters.cs
@@ -185,7 +185,9 @@ namespace Avalonia.Media.TextFormatting
                 }
 
                 //Stop at the first missing glyph
-                if (!currentCodepoint.IsBreakChar && !glyphTypeface.TryGetGlyph(currentCodepoint, out _))
+                if (!currentCodepoint.IsBreakChar && 
+                    currentCodepoint.GeneralCategory != GeneralCategory.Control && 
+                    !glyphTypeface.TryGetGlyph(currentCodepoint, out _))
                 {
                     break;
                 }