diff --git a/src/databaseinterface.cpp b/src/databaseinterface.cpp
--- a/src/databaseinterface.cpp
+++ b/src/databaseinterface.cpp
@@ -3195,7 +3195,13 @@
                                                   "  `Tracks` tracks2 "
                                                   "  WHERE "
                                                   "  tracks2.`AlbumTitle` = album.`Title` AND "
-                                                  "  tracks2.`AlbumArtistName` = album.`ArtistName` AND "
+                                                  "  ( "
+                                                  "    tracks2.`AlbumArtistName` = album.`ArtistName` OR "
+                                                  "    ( "
+                                                  "      tracks2.`AlbumArtistName` IS NULL AND "
+                                                  "      album.`ArtistName` IS NULL "
+                                                  "    )"
+                                                  "  ) AND "
                                                   "  (tracks2.`ArtistName` = :artistFilter OR tracks2.`AlbumArtistName` = :artistFilter) "
                                                   ") "
                                                   "GROUP BY album.`ID`, album.`Title`, album.`AlbumPath` "