diff --git a/src/Lidarr.Api.V1/Albums/AlbumController.cs b/src/Lidarr.Api.V1/Albums/AlbumController.cs
index 321d8f500..7028e8d6d 100644
--- a/src/Lidarr.Api.V1/Albums/AlbumController.cs
+++ b/src/Lidarr.Api.V1/Albums/AlbumController.cs
@@ -73,15 +73,13 @@ namespace Lidarr.Api.V1.Albums
 
                 foreach (var album in albums)
                 {
-                    album.Artist = artists[album.ArtistMetadataId];
-                    if (releases.TryGetValue(album.Id, out var albumReleases))
+                    if (!artists.TryGetValue(album.ArtistMetadataId, out var albumArtist))
                     {
-                        album.AlbumReleases = albumReleases;
-                    }
-                    else
-                    {
-                        album.AlbumReleases = new List<AlbumRelease>();
+                        continue;
                     }
+
+                    album.Artist = albumArtist;
+                    album.AlbumReleases = releases.TryGetValue(album.Id, out var albumReleases) ? albumReleases : new List<AlbumRelease>();
                 }
 
                 return MapToResource(albums, false);