diff --git a/persistence/album_repository.go b/persistence/album_repository.go
index c0cadc5e8..e9c666938 100644
--- a/persistence/album_repository.go
+++ b/persistence/album_repository.go
@@ -26,7 +26,7 @@ func NewAlbumRepository(ctx context.Context, o orm.Ormer) model.AlbumRepository
 	r.ormer = o
 	r.tableName = "album"
 	r.sortMappings = map[string]string{
-		"artist": "compilation asc, album_artist asc, name asc",
+		"artist": "compilation asc, order_album_artist_name asc, order_album_name asc",
 		"random": "RANDOM()",
 	}
 	r.filterMappings = map[string]filterFunc{
diff --git a/persistence/artist_repository.go b/persistence/artist_repository.go
index 07fccdaca..126b73324 100644
--- a/persistence/artist_repository.go
+++ b/persistence/artist_repository.go
@@ -26,6 +26,9 @@ func NewArtistRepository(ctx context.Context, o orm.Ormer) model.ArtistRepositor
 	r.ormer = o
 	r.indexGroups = utils.ParseIndexGroups(conf.Server.IndexGroups)
 	r.tableName = "artist"
+	r.sortMappings = map[string]string{
+		"name": "order_artist_name",
+	}
 	r.filterMappings = map[string]filterFunc{
 		"name": fullTextFilter,
 	}
diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go
index 3c893b9f3..4cd31b121 100644
--- a/persistence/mediafile_repository.go
+++ b/persistence/mediafile_repository.go
@@ -23,8 +23,8 @@ func NewMediaFileRepository(ctx context.Context, o orm.Ormer) *mediaFileReposito
 	r.ormer = o
 	r.tableName = "media_file"
 	r.sortMappings = map[string]string{
-		"artist": "artist asc, album asc, disc_number asc, track_number asc",
-		"album":  "album asc, disc_number asc, track_number asc",
+		"artist": "order_artist_name asc, album asc, disc_number asc, track_number asc",
+		"album":  "order_album_name asc, disc_number asc, track_number asc",
 	}
 	r.filterMappings = map[string]filterFunc{
 		"title": fullTextFilter,
diff --git a/ui/src/album/AlbumListView.js b/ui/src/album/AlbumListView.js
index 86fb4243b..7680111bc 100644
--- a/ui/src/album/AlbumListView.js
+++ b/ui/src/album/AlbumListView.js
@@ -29,11 +29,10 @@ const AlbumListView = ({ hasShow, hasEdit, hasList, ...rest }) => {
   const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))
   return (
     <Datagrid expand={<AlbumDetails />} rowClick={'show'} {...rest}>
-      <TextField source="name" sortBy={'orderAlbumName'} />
+      <TextField source="name" />
       <FunctionField
         source="artist"
         render={(r) => (r.albumArtist ? r.albumArtist : r.artist)}
-        sortBy={'orderAlbumArtistName'}
       />
       {isDesktop && <NumberField source="songCount" />}
       {isDesktop && <NumberField source="playCount" />}
diff --git a/ui/src/artist/ArtistList.js b/ui/src/artist/ArtistList.js
index b09b1bff7..ae95d33f2 100644
--- a/ui/src/artist/ArtistList.js
+++ b/ui/src/artist/ArtistList.js
@@ -26,7 +26,7 @@ const ArtistList = (props) => (
   <List
     {...props}
     title={<Title subTitle={'Artists'} />}
-    sort={{ field: 'orderArtistName', order: 'ASC' }}
+    sort={{ field: 'name', order: 'ASC' }}
     exporter={false}
     bulkActionButtons={false}
     filters={<ArtistFilter />}
@@ -34,7 +34,7 @@ const ArtistList = (props) => (
     pagination={<Pagination />}
   >
     <Datagrid rowClick={artistRowClick}>
-      <TextField source="name" sortBy={'orderArtistName'} />
+      <TextField source="name" />
       <NumberField source="albumCount" />
     </Datagrid>
   </List>
diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.js
index 174d6f459..f81d768f4 100644
--- a/ui/src/song/SongList.js
+++ b/ui/src/song/SongList.js
@@ -63,10 +63,8 @@ const SongList = (props) => {
           rowClick={(id, basePath, record) => dispatch(setTrack(record))}
         >
           <TextField source="title" />
-          {isDesktop && (
-            <AlbumLinkField source="album" sortBy={'orderAlbumName'} />
-          )}
-          <TextField source="artist" sortBy={'orderArtistName'} />
+          {isDesktop && <AlbumLinkField source="album" />}
+          <TextField source="artist" />
           {isDesktop && <NumberField source="trackNumber" />}
           {isDesktop && <NumberField source="playCount" />}
           {isDesktop && (