diff --git a/src/ui/Explore.cpp b/src/ui/Explore.cpp
index d11df72a..fcd41278 100644
--- a/src/ui/Explore.cpp
+++ b/src/ui/Explore.cpp
@@ -138,7 +138,11 @@ static std::vector<Database::Track::pointer> getArtistTracks(Wt::Dbo::Session& s
 	for (auto release : releases)
 	{
 		auto tracks = release->getTracks(clusters);
-		res.insert( res.end(), tracks.begin(), tracks.end() );
+		for (auto track : tracks)
+		{
+			if (track->getArtist() && track->getArtist().id() == artistId)
+				res.push_back(track);
+		}
 	}
 
 	return res;