diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
index 27713bbe6b..4700f41f53 100644
--- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
+++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
@@ -175,12 +175,20 @@ namespace MediaBrowser.Controller.MediaInfo
                 {
                     if (extractImages)
                     {
-                        // Disable for now on folder rips
-                        if (video.VideoType != VideoType.VideoFile && video.VideoType != VideoType.Dvd)
+                        if (video.VideoType == VideoType.HdDvd || video.VideoType == VideoType.Iso)
                         {
                             continue;
                         }
 
+                        if (video.VideoType == VideoType.BluRay)
+                        {
+                            // Can only extract reliably on single file blurays
+                            if (video.PlayableStreamFileNames == null || video.PlayableStreamFileNames.Count != 1)
+                            {
+                                continue;
+                            }
+                        }
+
                         // Add some time for the first chapter to make sure we don't end up with a black image
                         var time = chapter.StartPositionTicks == 0 ? TimeSpan.FromTicks(Math.Min(FirstChapterTicks, video.RunTimeTicks ?? 0)) : TimeSpan.FromTicks(chapter.StartPositionTicks);