diff --git a/TVHeadEnd/LiveTvService.cs b/TVHeadEnd/LiveTvService.cs
index 688e13cce..e8a76b18f 100644
--- a/TVHeadEnd/LiveTvService.cs
+++ b/TVHeadEnd/LiveTvService.cs
@@ -433,7 +433,7 @@ public async Task<MediaSourceInfo> GetChannelStream(string channelId, string med
                 livetvasset.SupportsDirectStream = false;
                 livetvasset.RequiresClosing = true;
                 livetvasset.SupportsProbing = false;
-                livetvasset.Container = "mpegts";
+                livetvasset.UseMostCompatibleTranscodingProfile = true;
                 livetvasset.RequiresOpening = true;
                 livetvasset.IsInfiniteStream  = true;
 
@@ -467,7 +467,7 @@ public async Task<MediaSourceInfo> GetChannelStream(string channelId, string med
                     AnalyzeDurationMs = 2000,
                     SupportsDirectStream = false,
                     SupportsProbing = false,
-                    Container = "mpegts",
+                    UseMostCompatibleTranscodingProfile = true,
                     MediaStreams = new List<MediaStream>
                     {
                         new MediaStream
@@ -584,7 +584,7 @@ public async Task<MediaSourceInfo> GetRecordingStream(string recordingId, string
                 recordingasset.SupportsDirectStream = false;
                 recordingasset.RequiresClosing = true;
                 recordingasset.SupportsProbing = false;
-                recordingasset.Container = "mpegts";
+                recordingasset.UseMostCompatibleTranscodingProfile = true;
                 recordingasset.RequiresOpening = true;
                 recordingasset.IsInfiniteStream  = true;
 
@@ -615,7 +615,7 @@ public async Task<MediaSourceInfo> GetRecordingStream(string recordingId, string
                     AnalyzeDurationMs = 2000,
                     SupportsDirectStream = false,
                     SupportsProbing = false,
-                    Container = "mpegts",
+                    UseMostCompatibleTranscodingProfile = true,
                     MediaStreams = new List<MediaStream>
                     {
                         new MediaStream
diff --git a/TVHeadEnd/RecordingsChannel.cs b/TVHeadEnd/RecordingsChannel.cs
index 7b082b40d..b819d95fd 100644
--- a/TVHeadEnd/RecordingsChannel.cs
+++ b/TVHeadEnd/RecordingsChannel.cs
@@ -283,8 +283,10 @@ private ChannelItemInfo ConvertToChannelItem(MyRecordingInfo item)
                         Path = path,
                         Protocol = path.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? MediaProtocol.Http : MediaProtocol.File,
                         Id = item.Id,
-                        Container = "mpegts",
-                        AnalyzeDurationMs = 2000,
+                        IsRemote = true,
+                        UseMostCompatibleTranscodingProfile = true,
+                        BufferMs = 1000,
+                        AnalyzeDurationMs = 0,
                         MediaStreams = new List<MediaStream>
                         {
                             new MediaStream