From 3ea9fea17d9e3339a75958197f5e422ee9f14592 Mon Sep 17 00:00:00 2001
From: Max <no@example.com>
Date: Tue, 20 May 2025 18:38:38 -0400
Subject: [PATCH] Fix music playback order for artists and albums

---
 src/components/playback/playbackmanager.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 1b5aee732..767aa7106 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -1843,7 +1843,7 @@ export class PlaybackManager {
                         ArtistIds: firstItem.Id,
                         Filters: 'IsNotFolder',
                         Recursive: true,
-                        SortBy: options.shuffle ? 'Random' : 'SortName',
+                        SortBy: options.shuffle ? 'Random' : 'Album,ParentIndexNumber,IndexNumber,SortName',
                         MediaTypes: 'Audio'
                     }, queryOptions));
                 case 'PhotoAlbum':
@@ -1924,7 +1924,11 @@ export class PlaybackManager {
                 if (options.shuffle) {
                     sortBy = 'Random';
                 } else if (firstItem.Type !== 'BoxSet') {
-                    sortBy = 'SortName';
+                    if (firstItem.CollectionType === 'music' || firstItem.MediaType === 'Audio') {
+                        sortBy = 'Album,ParentIndexNumber,IndexNumber,SortName';
+                    } else {
+                        sortBy = 'SortName';
+                    }
                 }
 
                 return getItemsForPlayback(serverId, mergePlaybackQueries({