diff --git a/ui/src/album/AlbumListView.js b/ui/src/album/AlbumListView.js
index 7680111b..86fb4243 100644
--- a/ui/src/album/AlbumListView.js
+++ b/ui/src/album/AlbumListView.js
@@ -29,10 +29,11 @@ const AlbumListView = ({ hasShow, hasEdit, hasList, ...rest }) => {
   const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))
   return (
     <Datagrid expand={<AlbumDetails />} rowClick={'show'} {...rest}>
-      <TextField source="name" />
+      <TextField source="name" sortBy={'orderAlbumName'} />
       <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 ae95d33f..b09b1bff 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: 'name', order: 'ASC' }}
+    sort={{ field: 'orderArtistName', order: 'ASC' }}
     exporter={false}
     bulkActionButtons={false}
     filters={<ArtistFilter />}
@@ -34,7 +34,7 @@ const ArtistList = (props) => (
     pagination={<Pagination />}
   >
     <Datagrid rowClick={artistRowClick}>
-      <TextField source="name" />
+      <TextField source="name" sortBy={'orderArtistName'} />
       <NumberField source="albumCount" />
     </Datagrid>
   </List>
diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.js
index f81d768f..174d6f45 100644
--- a/ui/src/song/SongList.js
+++ b/ui/src/song/SongList.js
@@ -63,8 +63,10 @@ const SongList = (props) => {
           rowClick={(id, basePath, record) => dispatch(setTrack(record))}
         >
           <TextField source="title" />
-          {isDesktop && <AlbumLinkField source="album" />}
-          <TextField source="artist" />
+          {isDesktop && (
+            <AlbumLinkField source="album" sortBy={'orderAlbumName'} />
+          )}
+          <TextField source="artist" sortBy={'orderArtistName'} />
           {isDesktop && <NumberField source="trackNumber" />}
           {isDesktop && <NumberField source="playCount" />}
           {isDesktop && (