diff --git a/src/shared/api/utils.ts b/src/shared/api/utils.ts
index cfb3f04d7..475c98f50 100644
--- a/src/shared/api/utils.ts
+++ b/src/shared/api/utils.ts
@@ -180,7 +180,11 @@ export const sortSongList = (songs: Song[], sortBy: SongListSort, sortOrder: Sor
             break;
 
         case SongListSort.COMMENT:
-            results = orderBy(results, ['comment'], [order]);
+            results = orderBy(
+                results,
+                ['comment', 'discNumber', 'trackNumber'],
+                [order, order, 'asc', 'asc'],
+            );
             break;
 
         case SongListSort.DURATION: