diff --git a/Slim/Control/Queries.pm b/Slim/Control/Queries.pm
index 67198b0187c..6dfc84af3f7 100644
--- a/Slim/Control/Queries.pm
+++ b/Slim/Control/Queries.pm
@@ -5390,7 +5390,8 @@ sub _getTagDataForTracks {
 		}
 
 		push @{$p}, map { Slim::Schema::Contributor->typeToRole($_) } @roles;
-		push @{$w}, 'contributors.id = tracks.primary_artist', 'contributor_track.role IN (' . join(', ', map {'?'} @roles) . ')';
+		push @{$w}, 'contributors.id = tracks.primary_artist' if $args->{trackIds};
+		push @{$w}, 'contributor_track.role IN (' . join(', ', map {'?'} @roles) . ')';
 	};
 	
 	$tags =~ /s/ && do {