diff --git a/src/utility/JellyfinApi/album.ts b/src/utility/JellyfinApi/album.ts
index c832afd..921f1e3 100644
--- a/src/utility/JellyfinApi/album.ts
+++ b/src/utility/JellyfinApi/album.ts
@@ -59,7 +59,7 @@ export async function retrieveRecentAlbums(numberOfAlbums = 24) {
 export async function retrieveAlbumTracks(ItemId: string) {
     const singleAlbumOptions = {
         ParentId: ItemId,
-        SortBy: 'SortName',
+        SortBy: 'IndexNumber,SortName',
     };
     const singleAlbumParams = new URLSearchParams(singleAlbumOptions).toString();
 
diff --git a/src/utility/JellyfinApi/playlist.ts b/src/utility/JellyfinApi/playlist.ts
index 1662e8e..27c1a51 100644
--- a/src/utility/JellyfinApi/playlist.ts
+++ b/src/utility/JellyfinApi/playlist.ts
@@ -28,7 +28,7 @@ export async function retrieveAllPlaylists() {
 export async function retrievePlaylistTracks(ItemId: string) {
     const credentials = asyncFetchStore().getState().settings.jellyfin;
     const singlePlaylistOptions = {
-        SortBy: 'SortName',
+        SortBy: 'IndexNumber,SortName',
         UserId: credentials?.user_id || '',
     };
     const singlePlaylistParams = new URLSearchParams(singlePlaylistOptions).toString();
diff --git a/src/utility/JellyfinApi/search.ts b/src/utility/JellyfinApi/search.ts
index 33a1b7b..8da8043 100644
--- a/src/utility/JellyfinApi/search.ts
+++ b/src/utility/JellyfinApi/search.ts
@@ -3,7 +3,7 @@ import { fetchApi } from './lib';
 
 const searchParams = {
     IncludeItemTypes: 'Audio,MusicAlbum',
-    SortBy: 'Album,SortName',
+    SortBy: 'SearchScore,Album,SortName',
     SortOrder: 'Ascending',
     Recursive: 'true',
 };