diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go
index ebf07ce17..8d4241a55 100644
--- a/persistence/mediafile_repository.go
+++ b/persistence/mediafile_repository.go
@@ -81,6 +81,7 @@ func NewMediaFileRepository(ctx context.Context, db dbx.Builder) model.MediaFile
 		"random":       "random",
 		"created_at":   "media_file.created_at",
 		"starred_at":   "starred, starred_at",
+		"album_tracks": "disc_number, track_number",
 	})
 	return r
 }
diff --git a/ui/src/album/AlbumShow.jsx b/ui/src/album/AlbumShow.jsx
index 1b706295a..b111a8ca7 100644
--- a/ui/src/album/AlbumShow.jsx
+++ b/ui/src/album/AlbumShow.jsx
@@ -35,7 +35,7 @@ const AlbumShowLayout = (props) => {
           addLabel={false}
           reference="song"
           target="album_id"
-          sort={{ field: 'album', order: 'ASC' }}
+          sort={{ field: 'album_tracks', order: 'ASC' }}
           perPage={0}
           pagination={null}
         >