diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 737fa9fd63..9a2acc1081 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -22,6 +22,15 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
+        protected override bool UseParentPathToCreateResolveArgs
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         /// <summary>
         /// We want to group into series not show individually in an index
         /// </summary>
diff --git a/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs
index 0ed02c10f0..aadaf54231 100644
--- a/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs
@@ -45,7 +45,8 @@ namespace MediaBrowser.Controller.Resolvers
                     return new TVideoType
                     {
                         VideoType = type,
-                        Path = args.Path
+                        Path = args.Path,
+                        IsInMixedFolder = true
                     };
                 }
             }
diff --git a/MediaBrowser.Providers/ImageFromMixedMediaLocationProvider.cs b/MediaBrowser.Providers/ImageFromMixedMediaLocationProvider.cs
new file mode 100644
index 0000000000..1539c9ddca
--- /dev/null
+++ b/MediaBrowser.Providers/ImageFromMixedMediaLocationProvider.cs
@@ -0,0 +1,95 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Providers
+{
+    class ImageFromMixedMediaLocationProvider : BaseMetadataProvider
+    {
+        public ImageFromMixedMediaLocationProvider(ILogManager logManager, IServerConfigurationManager configurationManager)
+            : base(logManager, configurationManager)
+        {
+        }
+
+        public override ItemUpdateType ItemUpdateType
+        {
+            get
+            {
+                return ItemUpdateType.ImageUpdate;
+            }
+        }
+
+        /// <summary>
+        /// Supportses the specified item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
+        public override bool Supports(BaseItem item)
+        {
+            if (item.LocationType != LocationType.FileSystem || item.ResolveArgs.IsDirectory)
+            {
+                return false;
+            }
+
+            var video = item as Video;
+
+            if (video != null && !(item is Episode))
+            {
+                return video.IsInMixedFolder;
+            }
+
+            var game = item as Game;
+
+            if (game != null)
+            {
+                return game.IsInMixedFolder;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the priority.
+        /// </summary>
+        /// <value>The priority.</value>
+        public override MetadataProviderPriority Priority
+        {
+            get { return MetadataProviderPriority.First; }
+        }
+
+        /// <summary>
+        /// Returns true or false indicating if the provider should refresh when the contents of it's directory changes
+        /// </summary>
+        /// <value><c>true</c> if [refresh on file system stamp change]; otherwise, <c>false</c>.</value>
+        protected override bool RefreshOnFileSystemStampChange
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the filestamp extensions.
+        /// </summary>
+        /// <value>The filestamp extensions.</value>
+        protected override string[] FilestampExtensions
+        {
+            get
+            {
+                return BaseItem.SupportedImageExtensions;
+            }
+        }
+
+        public override Task<bool> FetchAsync(BaseItem item, bool force, CancellationToken cancellationToken)
+        {
+            return TrueTaskResult;
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 28e6173789..1b429890a0 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -52,6 +52,7 @@
     <Compile Include="FolderProviderFromXml.cs" />
     <Compile Include="Games\GameProviderFromXml.cs" />
     <Compile Include="ImageFromMediaLocationProvider.cs" />
+    <Compile Include="ImageFromMixedMediaLocationProvider.cs" />
     <Compile Include="ImagesByNameProvider.cs" />
     <Compile Include="MediaInfo\AudioImageProvider.cs" />
     <Compile Include="MediaInfo\BaseFFProbeProvider.cs" />
diff --git a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
index 615f9d8a00..4a3e7e7a60 100644
--- a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
@@ -242,13 +242,16 @@ namespace MediaBrowser.Server.Implementations.Providers
 
             if (saveLocally)
             {
-                var video = item as Video;
-
-                if (video != null && video.IsInMixedFolder)
+                if (!(item is Episode))
                 {
-                    var folder = Path.GetDirectoryName(video.Path);
+                    var video = item as Video;
 
-                    path = Path.Combine(folder, Path.GetFileNameWithoutExtension(video.Path) + "-" + filename);
+                    if (video != null && video.IsInMixedFolder)
+                    {
+                        var folder = Path.GetDirectoryName(video.Path);
+
+                        path = Path.Combine(folder, Path.GetFileNameWithoutExtension(video.Path) + "-" + filename);
+                    }
                 }
 
                 if (string.IsNullOrEmpty(path) && !string.IsNullOrEmpty(item.MetaLocation))