diff --git a/ui/src/common/ContextMenus.jsx b/ui/src/common/ContextMenus.jsx
index 855825496..f27ee4602 100644
--- a/ui/src/common/ContextMenus.jsx
+++ b/ui/src/common/ContextMenus.jsx
@@ -228,7 +228,7 @@ export const AlbumContextMenu = (props) =>
       resource={'album'}
       songQueryParams={{
         pagination: { page: 1, perPage: -1 },
-        sort: { field: 'album', order: 'ASC' },
+        sort: { field: 'album_tracks', order: 'ASC' },
         filter: {
           album_id: props.record.id,
           release_date: props.releaseDate,
diff --git a/ui/src/common/PlayButton.jsx b/ui/src/common/PlayButton.jsx
index 04b36ef5b..a11e08361 100644
--- a/ui/src/common/PlayButton.jsx
+++ b/ui/src/common/PlayButton.jsx
@@ -21,7 +21,7 @@ export const PlayButton = ({ record, size, className }) => {
     dataProvider
       .getList('song', {
         pagination: { page: 1, perPage: -1 },
-        sort: { field: 'album', order: 'ASC' },
+        sort: { field: 'album_tracks', order: 'ASC' },
         filter: {
           album_id: record.id,
           release_date: record.releaseDate,