diff --git a/api/get_music_directory.go b/api/get_music_directory.go
index 02a68c947..6be1079eb 100644
--- a/api/get_music_directory.go
+++ b/api/get_music_directory.go
@@ -53,7 +53,7 @@ func (c *GetMusicDirectoryController) buildArtistDir(a *domain.Artist, albums []
 		dir.Child[i].Parent = al.ArtistId
 		dir.Child[i].Album = al.Name
 		dir.Child[i].Year = al.Year
-		dir.Child[i].Artist = al.Artist
+		dir.Child[i].Artist = al.AlbumArtist
 		dir.Child[i].Genre = al.Genre
 		dir.Child[i].CoverArt = al.CoverArtId
 		if al.Starred {
diff --git a/scanner/itunes_scanner.go b/scanner/itunes_scanner.go
index 90a7d0ce5..da4ebb053 100644
--- a/scanner/itunes_scanner.go
+++ b/scanner/itunes_scanner.go
@@ -110,7 +110,7 @@ func (s *ItunesScanner) collectAlbums(t *itl.Track, mf *domain.MediaFile, ar *do
 	al.PlayCount += t.PlayCount
 	al.Genre = mf.Genre
 	al.Artist = mf.Artist
-	al.AlbumArtist = mf.AlbumArtist
+	al.AlbumArtist = ar.Name
 
 	if mf.HasCoverArt {
 		al.CoverArtId = mf.Id