1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js
index d85fd10be45..cf24d18c7b6 100644
--- a/app/assets/javascripts/mr_notes/init_notes.js
+++ b/app/assets/javascripts/mr_notes/init_notes.js
@@ -44,7 +44,13 @@ export default () => {
     },
     watch: {
       discussionTabCounter() {
-        this.updateDiscussionTabCounter();
+        if (window.gon?.features?.paginatedMrDiscussions) {
+          if (this.$store.state.notes.doneFetchingBatchDiscussions) {
+            this.updateDiscussionTabCounter();
+          }
+        } else {
+          this.updateDiscussionTabCounter();
+        }
       },
       isShowTabActive: {
         handler(newVal) {