diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
index 558e96b097..b0384a1fdf 100644
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@@ -82,7 +82,7 @@ namespace Avalonia.Skia
 
                 if (codepoint.IsBreakChar)
                 {
-                    if (i < text.Length)
+                    if (i + 1 < text.Length)
                     {
                         var nextCodepoint = Codepoint.ReadAt(text, i + 1, out _);