diff --git a/src/renderer/api/jellyfin.types.ts b/src/renderer/api/jellyfin.types.ts
index 0066186b..dae3f8d3 100644
--- a/src/renderer/api/jellyfin.types.ts
+++ b/src/renderer/api/jellyfin.types.ts
@@ -574,7 +574,7 @@ export enum JFSongListSort {
     ARTIST = 'Artist,Album,SortName',
     COMMUNITY_RATING = 'CommunityRating,SortName',
     DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'Name,SortName',
+    NAME = 'SortName,Name',
     PLAY_COUNT = 'PlayCount,SortName',
     RANDOM = 'Random,SortName',
     RECENTLY_ADDED = 'DateCreated,SortName',
@@ -601,7 +601,7 @@ export type JFSongListParams = {
 export enum JFAlbumArtistListSort {
     ALBUM = 'Album,SortName',
     DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'Name,SortName',
+    NAME = 'SortName,Name',
     RANDOM = 'Random,SortName',
     RECENTLY_ADDED = 'DateCreated,SortName',
     RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
@@ -618,7 +618,7 @@ export type JFAlbumArtistListParams = {
 export enum JFArtistListSort {
     ALBUM = 'Album,SortName',
     DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'Name,SortName',
+    NAME = 'SortName,Name',
     RANDOM = 'Random,SortName',
     RECENTLY_ADDED = 'DateCreated,SortName',
     RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
diff --git a/src/renderer/api/jellyfin/jellyfin-controller.ts b/src/renderer/api/jellyfin/jellyfin-controller.ts
index ce9fe6cb..e480deda 100644
--- a/src/renderer/api/jellyfin/jellyfin-controller.ts
+++ b/src/renderer/api/jellyfin/jellyfin-controller.ts
@@ -231,7 +231,7 @@ const getAlbumArtistList = async (args: AlbumArtistListArgs): Promise<AlbumArtis
             ParentId: query.musicFolderId,
             Recursive: true,
             SearchTerm: query.searchTerm,
-            SortBy: albumArtistListSortMap.jellyfin[query.sortBy] || 'Name,SortName',
+            SortBy: albumArtistListSortMap.jellyfin[query.sortBy] || 'SortName,Name',
             SortOrder: sortOrderMap.jellyfin[query.sortOrder],
             StartIndex: query.startIndex,
             UserId: apiClientProps.server?.userId || undefined,
@@ -257,7 +257,7 @@ const getArtistList = async (args: ArtistListArgs): Promise<AlbumArtistListRespo
             Limit: query.limit,
             ParentId: query.musicFolderId,
             Recursive: true,
-            SortBy: artistListSortMap.jellyfin[query.sortBy] || 'Name,SortName',
+            SortBy: artistListSortMap.jellyfin[query.sortBy] || 'SortName,Name',
             SortOrder: sortOrderMap.jellyfin[query.sortOrder],
             StartIndex: query.startIndex,
         },
diff --git a/src/renderer/api/jellyfin/jellyfin-types.ts b/src/renderer/api/jellyfin/jellyfin-types.ts
index 683a2eac..a95c8617 100644
--- a/src/renderer/api/jellyfin/jellyfin-types.ts
+++ b/src/renderer/api/jellyfin/jellyfin-types.ts
@@ -512,7 +512,7 @@ const albumList = pagination.extend({
 const albumArtistListSort = {
     ALBUM: 'Album,SortName',
     DURATION: 'Runtime,AlbumArtist,Album,SortName',
-    NAME: 'Name,SortName',
+    NAME: 'SortName,Name',
     RANDOM: 'Random,SortName',
     RECENTLY_ADDED: 'DateCreated,SortName',
     RELEASE_DATE: 'PremiereDate,AlbumArtist,Album,SortName',
@@ -542,7 +542,7 @@ const songListSort = {
     ARTIST: 'Artist,Album,SortName',
     COMMUNITY_RATING: 'CommunityRating,SortName',
     DURATION: 'Runtime,AlbumArtist,Album,SortName',
-    NAME: 'Name,SortName',
+    NAME: 'SortName,Name',
     PLAY_COUNT: 'PlayCount,SortName',
     RANDOM: 'Random,SortName',
     RECENTLY_ADDED: 'DateCreated,SortName',