diff --git a/dashboard/src/app/dashboard.component.ts b/dashboard/src/app/dashboard.component.ts
index fb958a3..dc2917e 100644
--- a/dashboard/src/app/dashboard.component.ts
+++ b/dashboard/src/app/dashboard.component.ts
@@ -76,7 +76,7 @@ export class DashboardComponent implements OnInit {
         // Search good artist by track count
         albums.forEach(album => {
           if (album['Track Count'] === albumBucket.doc_count) {
-            this.albumArtists[album.Name] = album['Album Artist'].toString();
+            this.albumArtists[album.Name] = album['Album Artist'] ? album['Album Artist'].toString() : album.Artist.toString();
           }
         });
       } else {