2 files changed, 3 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 9e4129cd12..6f4a0c4d2c 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// </summary>
         /// <value><c>true</c> if this instance has embedded image; otherwise, <c>false</c>.</value>
         public bool HasEmbeddedImage { get; set; }
-        
+
         /// <summary>
         /// Override this to true if class should be grouped under a container in indicies
         /// The container class should be defined via IndexContainer
@@ -37,10 +37,6 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         /// <summary>
-        /// The unknown album
-        /// </summary>
-        private static readonly MusicAlbum UnknownAlbum = new MusicAlbum { Name = "<Unknown>" };
-        /// <summary>
         /// Override this to return the folder that should be used to construct a container
         /// for this item in an index.  GroupInIndex should be true as well.
         /// </summary>
@@ -50,7 +46,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             get
             {
-                return Parent is MusicAlbum ? Parent : Album != null ? new MusicAlbum { Name = Album, PrimaryImagePath = PrimaryImagePath } : UnknownAlbum;
+                return Parents.OfType<MusicAlbum>().FirstOrDefault() ?? new MusicAlbum { Name = "<Unknown>" };
             }
         }
 
diff --git a/MediaBrowser.Controller/Entities/IHasImages.cs b/MediaBrowser.Controller/Entities/IHasImages.cs
index 2fef9a035f..18e6afcd18 100644
--- a/MediaBrowser.Controller/Entities/IHasImages.cs
+++ b/MediaBrowser.Controller/Entities/IHasImages.cs
@@ -81,7 +81,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the primary image path.
         /// </summary>
         /// <value>The primary image path.</value>
-        string PrimaryImagePath { get; set; }
+        string PrimaryImagePath { get; }
 
         /// <summary>
         /// Gets the preferred metadata language.