diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
index b3c7fe131e..17cfdffe84 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -175,7 +175,7 @@ public class MediaStreamRepository : IMediaStreamRepository
                 var culture = _localization.FindLanguageInfo(dto.Language);
                 // Truncate at the first delimiter to avoid cluttered display names
                 dto.LocalizedLanguage = culture?.DisplayName is { } name
-                    ? name.Split(';', ',')[0].Trim()
+                    ? name.Split([';', ','])[0].Trim()
                     : null;
             }
 
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 98bdce0e9c..a9c37c0025 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -730,11 +730,12 @@ namespace MediaBrowser.MediaEncoding.Probing
                 stream.LocalizedDefault = _localization.GetLocalizedString("Default");
                 stream.LocalizedExternal = _localization.GetLocalizedString("External");
                 stream.LocalizedOriginal = _localization.GetLocalizedString("Original");
-                stream.LocalizedLanguage = string.IsNullOrEmpty(stream.Language)
-                    ? null
-                    : _localization.FindLanguageInfo(stream.Language)?.DisplayName is { } name
-                        ? name.Split(';', ',')[0].Trim()
+                if (!string.IsNullOrEmpty(stream.Language))
+                {
+                    stream.LocalizedLanguage = _localization.FindLanguageInfo(stream.Language)?.DisplayName is { } name
+                        ? name.Split([';', ','])[0].Trim()
                         : null;
+                }
 
                 stream.Channels = streamInfo.Channels;
 
@@ -773,11 +774,12 @@ namespace MediaBrowser.MediaEncoding.Probing
                 stream.LocalizedForced = _localization.GetLocalizedString("Forced");
                 stream.LocalizedExternal = _localization.GetLocalizedString("External");
                 stream.LocalizedHearingImpaired = _localization.GetLocalizedString("HearingImpaired");
-                stream.LocalizedLanguage = string.IsNullOrEmpty(stream.Language)
-                    ? null
-                    : _localization.FindLanguageInfo(stream.Language)?.DisplayName is { } name
-                        ? name.Split(';', ',')[0].Trim()
+                if (!string.IsNullOrEmpty(stream.Language))
+                {
+                    stream.LocalizedLanguage = _localization.FindLanguageInfo(stream.Language)?.DisplayName is { } name
+                        ? name.Split([';', ','])[0].Trim()
                         : null;
+                }
 
                 if (string.IsNullOrEmpty(stream.Title))
                 {