diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs index 91a94de6f6..8b78877b82 100644 --- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs +++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs @@ -44,7 +44,11 @@ namespace Avalonia.Skia var usedCulture = culture ?? CultureInfo.CurrentCulture; #if NETSTANDARD2_0 - buffer.Language = s_cachedLanguage.GetOrAdd(usedCulture.LCID, _ => new Language(culture)); + if (!s_cachedLanguage.TryGetValue(usedCulture.LCID, out var language)) + { + language = s_cachedLanguage.GetOrAdd(usedCulture.LCID, new Language(usedCulture)); + } + buffer.Language = language; #else buffer.Language = s_cachedLanguage.GetOrAdd( usedCulture.LCID,