diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 7fe8a08c76..054bef1ddc 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -290,12 +290,15 @@ namespace MediaBrowser.Api.Playback.Hls
             {
                 using (var reader = new StreamReader(fileStream))
                 {
-                    var text = await reader.ReadToEndAsync().ConfigureAwait(false);
-
-                    // If it appears in the playlist, it's done
-                    if (text.IndexOf(segmentFilename, StringComparison.OrdinalIgnoreCase) != -1)
+                    while (!reader.EndOfStream)
                     {
-                        return GetSegmentResult(segmentPath, segmentIndex, segmentLength, transcodingJob);
+                        var text = await reader.ReadLineAsync().ConfigureAwait(false);
+
+                        // If it appears in the playlist, it's done
+                        if (text.IndexOf(segmentFilename, StringComparison.OrdinalIgnoreCase) != -1)
+                        {
+                            return GetSegmentResult(segmentPath, segmentIndex, segmentLength, transcodingJob);
+                        }
                     }
                 }
             }
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 6bbcef5914..aa382ba431 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Api.Playback
         public string LiveTvStreamId { get; set; }
 
         public int SegmentLength = 3;
-        public bool EnableGenericHlsSegmenter;
+        public bool EnableGenericHlsSegmenter = false;
         public int HlsListSize
         {
             get