diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go
index e30e02cfd..887b79ad2 100644
--- a/persistence/mediafile_repository.go
+++ b/persistence/mediafile_repository.go
@@ -26,8 +26,8 @@ func NewMediaFileRepository(ctx context.Context, o orm.Ormer) *mediaFileReposito
 	r.ormer = o
 	r.tableName = "media_file"
 	r.sortMappings = map[string]string{
-		"artist": "order_artist_name asc, album asc, disc_number asc, track_number asc",
-		"album":  "order_album_name asc, disc_number asc, track_number asc, artist asc, title asc",
+		"artist": "order_artist_name asc, order_album_name asc, disc_number asc, track_number asc",
+		"album":  "order_album_name asc, disc_number asc, track_number asc, order_artist_name asc, title asc",
 		"random": "RANDOM()",
 	}
 	r.filterMappings = map[string]filterFunc{