Index: src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
===================================================================
--- src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(revision 4857)
+++ src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs	(working copy)
@@ -58,10 +58,12 @@
 
         private static HyenaSqliteCommand count_query = new HyenaSqliteCommand (@"
             SELECT count(DISTINCT CoreTracks.AlbumID)
-            FROM CoreTracks
+            FROM CoreTracks, CoreArtists, CoreAlbums
             WHERE
                 CoreTracks.PrimarySourceID = ? AND
                 CoreTracks.DateUpdatedStamp > ? AND
+                CoreTracks.AlbumID = CoreAlbums.AlbumID AND 
+                CoreAlbums.ArtistID = CoreArtists.ArtistID AND
                 CoreTracks.AlbumID NOT IN (
                     SELECT AlbumID FROM CoverArtDownloads WHERE
                         LastAttempt > ? OR Downloaded = 1)");
