diff --git a/src/renderer/api/navidrome.api.ts b/src/renderer/api/navidrome.api.ts
index 7e9d2d5c..03e7df62 100644
--- a/src/renderer/api/navidrome.api.ts
+++ b/src/renderer/api/navidrome.api.ts
@@ -251,7 +251,7 @@ const getSongList = async (args: SongListArgs): Promise<NDSongList> => {
   const { query, server, signal } = args;
 
   const searchParams: NDSongListParams = {
-    _end: query.startIndex + (query.limit || 0),
+    _end: query.startIndex + (query.limit || -1),
     _order: sortOrderMap.navidrome[query.sortOrder],
     _sort: songListSortMap.navidrome[query.sortBy],
     _start: query.startIndex,
diff --git a/src/renderer/api/navidrome.types.ts b/src/renderer/api/navidrome.types.ts
index 86653e02..91cdeca6 100644
--- a/src/renderer/api/navidrome.types.ts
+++ b/src/renderer/api/navidrome.types.ts
@@ -215,6 +215,7 @@ export type NDAlbumListParams = {
 export enum NDSongListSort {
   ALBUM = 'album, order_album_artist_name, disc_number, track_number, title',
   ALBUM_ARTIST = 'albumArtist',
+  ALBUM_SONGS = 'discNumber, trackNumber',
   ARTIST = 'artist',
   BPM = 'bpm',
   CHANNELS = 'channels',
diff --git a/src/renderer/api/types.ts b/src/renderer/api/types.ts
index ee63866b..8003080f 100644
--- a/src/renderer/api/types.ts
+++ b/src/renderer/api/types.ts
@@ -481,7 +481,7 @@ export const songListSortMap: SongListSortMap = {
     year: undefined,
   },
   navidrome: {
-    album: NDSongListSort.ALBUM,
+    album: NDSongListSort.ALBUM_SONGS,
     albumArtist: NDSongListSort.ALBUM_ARTIST,
     artist: NDSongListSort.ARTIST,
     bpm: NDSongListSort.BPM,