diff --git a/discovery-provider/src/queries/get_save_tracks.py b/discovery-provider/src/queries/get_save_tracks.py
index 7b8753075ea..761cda0e38d 100644
--- a/discovery-provider/src/queries/get_save_tracks.py
+++ b/discovery-provider/src/queries/get_save_tracks.py
@@ -85,7 +85,7 @@ def get_save_tracks(args: GetSaveTracksArgs):
         elif sort_method == SortMethod.artist_name:
             base_query = base_query.join(
                 TrackWithAggregates.user, aliased=True
-            ).order_by(sort_fn(TrackWithAggregates.user.name))
+            ).order_by(sort_fn(User.name))
         elif sort_method == SortMethod.release_date:
             base_query = base_query.order_by(
                 sort_fn(
diff --git a/discovery-provider/src/queries/get_tracks.py b/discovery-provider/src/queries/get_tracks.py
index 0a1a9cea538..4005a62549e 100644
--- a/discovery-provider/src/queries/get_tracks.py
+++ b/discovery-provider/src/queries/get_tracks.py
@@ -140,7 +140,7 @@ def _get_tracks(session, args):
         elif sort_method == SortMethod.artist_name:
             base_query = base_query.join(
                 TrackWithAggregates.user, aliased=True
-            ).order_by(sort_fn(TrackWithAggregates.user.name))
+            ).order_by(sort_fn(User.name))
         elif sort_method == SortMethod.release_date:
             base_query = base_query.order_by(
                 sort_fn(
diff --git a/discovery-provider/src/queries/get_user_listening_history.py b/discovery-provider/src/queries/get_user_listening_history.py
index 6fe525d11fc..7d0c407338f 100644
--- a/discovery-provider/src/queries/get_user_listening_history.py
+++ b/discovery-provider/src/queries/get_user_listening_history.py
@@ -104,7 +104,7 @@ def _get_user_listening_history(session: Session, args: GetUserListeningHistoryA
         base_query = base_query.order_by(sort_fn(TrackWithAggregates.title))
     elif sort_method == SortMethod.artist_name:
         base_query = base_query.join(TrackWithAggregates.user, aliased=True).order_by(
-            sort_fn(TrackWithAggregates.user.name)
+            sort_fn(User.name)
         )
     elif sort_method == SortMethod.release_date:
         base_query = base_query.order_by(