diff --git a/lib/music_library/collection.ex b/lib/music_library/collection.ex
index eb0d6c1f..02ec4756 100644
--- a/lib/music_library/collection.ex
+++ b/lib/music_library/collection.ex
@@ -56,7 +56,7 @@ defmodule MusicLibrary.Collection do
         where: fragment("records.purchased_at IS NOT NULL"),
         select: r.value
 
-    Repo.all(q)
+    q |> Repo.all() |> MapSet.new()
   end
 
   defp base_search do
diff --git a/lib/music_library/records.ex b/lib/music_library/records.ex
index 4d11f850..376a844f 100644
--- a/lib/music_library/records.ex
+++ b/lib/music_library/records.ex
@@ -103,7 +103,7 @@ defmodule MusicLibrary.Records do
   def get_all_artist_ids do
     q = from ar in ArtistRecord, distinct: true, select: ar.musicbrainz_id
 
-    Repo.all(q)
+    q |> Repo.all() |> MapSet.new()
   end
 
   def get_artist_records(musicbrainz_id) do
diff --git a/lib/music_library/wishlist.ex b/lib/music_library/wishlist.ex
index bcb19192..22281883 100644
--- a/lib/music_library/wishlist.ex
+++ b/lib/music_library/wishlist.ex
@@ -27,7 +27,7 @@ defmodule MusicLibrary.Wishlist do
         where: fragment("records.purchased_at IS NULL"),
         select: r.value
 
-    Repo.all(q)
+    q |> Repo.all() |> MapSet.new()
   end
 
   defp base_search do