diff --git a/src/renderer/api/jellyfin/jellyfin-controller.ts b/src/renderer/api/jellyfin/jellyfin-controller.ts
index 70d80a07..0d961455 100644
--- a/src/renderer/api/jellyfin/jellyfin-controller.ts
+++ b/src/renderer/api/jellyfin/jellyfin-controller.ts
@@ -256,7 +256,7 @@ const getAlbumDetail = async (args: AlbumDetailArgs): Promise<AlbumDetailRespons
             Fields: 'Genres, DateCreated, MediaSources, ParentId',
             IncludeItemTypes: 'Audio',
             ParentId: query.id,
-            SortBy: 'Album,SortName',
+            SortBy: 'ParentIndexNumber,IndexNumber,SortName',
         },
     });
 
diff --git a/src/renderer/api/jellyfin/jellyfin-types.ts b/src/renderer/api/jellyfin/jellyfin-types.ts
index 4314baab..47215cb0 100644
--- a/src/renderer/api/jellyfin/jellyfin-types.ts
+++ b/src/renderer/api/jellyfin/jellyfin-types.ts
@@ -529,6 +529,7 @@ const similarArtistListParameters = baseParameters.extend({
 const songListSort = {
     ALBUM: 'Album,SortName',
     ALBUM_ARTIST: 'AlbumArtist,Album,SortName',
+    ALBUM_DETAIL: 'ParentIndexNumber,IndexNumber,SortName',
     ARTIST: 'Artist,Album,SortName',
     COMMUNITY_RATING: 'CommunityRating,SortName',
     DURATION: 'Runtime,AlbumArtist,Album,SortName',