diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 11e8e953ae..8fb96f664d 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -370,18 +370,8 @@ import 'emby-playstatebutton';
                     }
                 }
             } else {
-                let showArtist = options.artist === true;
-                const artistItems = item.ArtistItems;
-
-                if (!showArtist && options.artist !== false) {
-                    if (!artistItems || !artistItems.length) {
-                        showArtist = true;
-                    } else if (artistItems.length > 1 || !containerAlbumArtistIds.includes(artistItems[0].Id)) {
-                        showArtist = true;
-                    }
-                }
-
-                if (showArtist) {
+                if (options.artist) {
+                    const artistItems = item.ArtistItems;
                     if (artistItems && item.Type !== 'MusicAlbum') {
                         textlines.push(artistItems.map(a => {
                             return a.Name;
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index b1781e75f0..c1ec022e5a 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1337,16 +1337,25 @@ function renderChildren(page, item) {
         const childrenItemsContainer = page.querySelector('.childrenItemsContainer');
 
         if (item.Type == 'MusicAlbum') {
+            const equalSet = (arr1, arr2) => arr1.every(x => arr2.indexOf(x) !== -1) && arr1.length === arr2.length;
+            let showArtist = false;
+            for (const track of result.Items) {
+                if (!equalSet(track.ArtistItems.map(x => x.Id), track.AlbumArtists.map(x => x.Id))) {
+                    showArtist = true;
+                    break;
+                }
+            }
+            const discNumbers = result.Items.map(x => x.ParentIndexNumber);
             html = listView.getListViewHtml({
                 items: result.Items,
                 smallIcon: true,
-                showIndex: true,
+                showIndex: new Set(discNumbers).size > 1 || (discNumbers.length >= 1 && discNumbers[0] > 1),
                 index: 'disc',
                 showIndexNumberLeft: true,
                 playFromHere: true,
                 action: 'playallfromhere',
                 image: false,
-                artist: 'auto',
+                artist: showArtist,
                 containerAlbumArtists: item.AlbumArtists
             });
             isList = true;