3 files changed, 9 insertions, 5 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 75b8c137f7..c9697c685c 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -1555,7 +1555,7 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                if (!subtitleStream.IsExternal && !transcoderSupport.CanExtractSubtitles(subtitleStream.Codec))
+                if (!subtitleStream.IsExternal && playMethod == PlayMethod.Transcode && !transcoderSupport.CanExtractSubtitles(subtitleStream.Codec))
                 {
                     continue;
                 }
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 11f81ff7d8..4491fb5ace 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
 using System.Text;
 using System.Text.Json.Serialization;
 using Jellyfin.Data.Enums;
diff --git a/MediaBrowser.Model/System/FolderStorageInfo.cs b/MediaBrowser.Model/System/FolderStorageInfo.cs
index 7b10e4ea58..ebca39228b 100644
--- a/MediaBrowser.Model/System/FolderStorageInfo.cs
+++ b/MediaBrowser.Model/System/FolderStorageInfo.cs
@@ -11,17 +11,22 @@ public record FolderStorageInfo
     public required string Path { get; init; }
 
     /// <summary>
-    /// Gets the free space of the underlying storage device of the <see cref="Path"/>.
+    /// Gets the fully resolved path of the folder in question (interpolating any symlinks if present).
+    /// </summary>
+    public required string ResolvedPath { get; init; }
+
+    /// <summary>
+    /// Gets the free space of the underlying storage device of the <see cref="ResolvedPath"/>.
     /// </summary>
     public long FreeSpace { get; init; }
 
     /// <summary>
-    /// Gets the used space of the underlying storage device of the <see cref="Path"/>.
+    /// Gets the used space of the underlying storage device of the <see cref="ResolvedPath"/>.
     /// </summary>
     public long UsedSpace { get; init; }
 
     /// <summary>
-    /// Gets the kind of storage device of the <see cref="Path"/>.
+    /// Gets the kind of storage device of the <see cref="ResolvedPath"/>.
     /// </summary>
     public string? StorageType { get; init; }