diff --git a/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.ts b/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.ts
index 87830b91b3b9e20dd4a4449b41977682a2d2d656..51e4354f92d1b49270a31ab2be7b3a62d23910c2 100644
--- a/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.ts
+++ b/src/app/components/creator/_dialogs/comment-settings/comment-settings.component.ts
@@ -119,15 +119,14 @@ export class CommentSettingsComponent implements OnInit {
               return a.bonusToken ? -1 : 1;
             });
             if (!sortedComments[0].bonusToken) {
-              sortedComments = comments.sort((a) => {
-                return a.favorite ? -1 : 1;
+              sortedComments = comments.sort((a, b) => {
+                const dateA = new Date(a.timestamp), dateB = new Date(b.timestamp);
+                return (+dateB > +dateA) ? 1 : (+dateA > +dateB) ? -1 : 0;
+              });
+            } else {
+              sortedComments = sortedComments.sort((a, b) => {
+                return a.bonusToken < b.bonusToken ? -1 : 1;
               });
-              if (!sortedComments[0].favorite) {
-                sortedComments = comments.sort((a, b) => {
-                  const dateA = new Date(a.timestamp), dateB = new Date(b.timestamp);
-                  return (+dateB > +dateA) ? 1 : (+dateA > +dateB) ? -1 : 0;
-                });
-              }
             }
             const exportComments = JSON.parse(JSON.stringify(sortedComments));
             let valueFields = '';