diff --git a/src/shared/api/utils.ts b/src/shared/api/utils.ts index c1317d2c5..cdb1d396f 100644 --- a/src/shared/api/utils.ts +++ b/src/shared/api/utils.ts @@ -431,14 +431,25 @@ export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder: return new Date(v.originalDate).getTime(); } - // Fallback to the first day of the release year + // Fallback to the first day of the original year if (v.originalYear) { return new Date(v.originalYear, 0, 1).getTime(); } return 0; }, + (v) => { + if (v.releaseDate) { + return new Date(v.releaseDate).getTime(); + } + + // Fallback to the first day of the release year + if (v.releaseYear) { + return new Date(v.releaseYear, 0, 1).getTime(); + } + return 0; + }, ], - [order], + [order, order], ); break; case AlbumListSort.SONG_COUNT: