diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/database/impl/Artist.cpp
index bb070c5d..92a0e307 100644
--- a/src/libs/database/impl/Artist.cpp
+++ b/src/libs/database/impl/Artist.cpp
@@ -41,7 +41,7 @@ namespace lms::db
             session.checkReadTransaction();
 
             // TODO remove distinct and use group by
-            auto query{ session.getDboSession()->query<ResultType>("SELECT DISTINCT " + std::string{ itemToSelect } + " FROM artist a") };
+            auto query{ session.getDboSession()->query<ResultType>("SELECT " + std::string{ itemToSelect } + " FROM artist a") };
             if (params.sortMethod == ArtistSortMethod::LastWritten
                 || params.writtenAfter.isValid()
                 || params.linkType
@@ -154,6 +154,8 @@ namespace lms::db
                 break;
             }
 
+            query.groupBy("a.id");
+
             return query;
         }