1 files changed, 8 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 79624826ae..36cf995f5d 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -1,7 +1,8 @@
-using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities.Audio
 {
@@ -79,9 +80,11 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             get
             {
-                var child = Children.FirstOrDefault();
-
-                return child == null ? base.Genres : child.Genres;
+                return Children
+                    .OfType<Audio>()
+                    .SelectMany(i => i.Genres)
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList();
             }
             set
             {