diff --git a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
index ff11b9a2b..418400311 100644
--- a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
@@ -344,6 +344,9 @@ namespace MediaBrowser.Server.Implementations.Providers
                 case ImageType.Art:
                     filename = "clearart";
                     break;
+                case ImageType.Disc:
+                    filename = item is MusicAlbum ? "cdart" : "disc";
+                    break;
                 case ImageType.Primary:
                     filename = item is Episode ? Path.GetFileNameWithoutExtension(item.Path) : "folder";
                     break;
@@ -478,6 +481,11 @@ namespace MediaBrowser.Server.Implementations.Providers
 
             if (type == ImageType.Primary)
             {
+                if (item is MusicAlbum || item is Artist || item is MusicArtist)
+                {
+                    return new[] { Path.Combine(item.Path, "folder" + extension) };
+                }
+
                 if (item is Season && item.IndexNumber.HasValue)
                 {
                     var seriesFolder = Path.GetDirectoryName(item.Path);