diff --git a/src/libs/database/impl/Track.cpp b/src/libs/database/impl/Track.cpp
index d0d2d1b9..1e11fd34 100644
--- a/src/libs/database/impl/Track.cpp
+++ b/src/libs/database/impl/Track.cpp
@@ -429,6 +429,8 @@ namespace lms::db
             query.bind(type);
 
         query.where("t.id = ?").bind(getId());
+        query.groupBy("t_a_l.artist_id");
+        query.orderBy("t_a_l.id");
 
         return utils::fetchQueryResults<Artist::pointer>(query);
     }
@@ -463,6 +465,7 @@ namespace lms::db
 
         query.where("t.id = ?").bind(getId());
         query.groupBy("t_a_l.artist_id");
+        query.orderBy("t_a_l.id");
 
         return utils::fetchQueryResults(query);
     }