diff --git a/src/db.c b/src/db.c
index 6e1d3429..bf990fc3 100644
--- a/src/db.c
+++ b/src/db.c
@@ -280,7 +280,7 @@ static const char *sort_clause[] =
     "",
     "ORDER BY f.title_sort ASC",
     "ORDER BY f.album_sort ASC, f.disc ASC, f.track ASC",
-    "ORDER BY f.album_artist_sort ASC",
+    "ORDER BY f.album_artist_sort ASC, f.album_sort ASC, f.disc ASC, f.track ASC",
     "ORDER BY f.type ASC, f.parent_id ASC, f.special_id ASC, f.title ASC",
     "ORDER BY f.year ASC",
     "ORDER BY f.genre ASC",