2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index acfc62fe5cb..7e2acd8a450 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -240,6 +240,10 @@ export default class MergeRequestTabs {
     return newState;
   }
 
+  getCurrentAction() {
+    return this.currentAction;
+  }
+
   loadCommits(source) {
     if (this.commitsLoaded) {
       return;
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 643648fba53..42eaf0ada02 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -362,6 +362,11 @@ export default class Notes {
    * Note: for rendering inline notes use renderDiscussionNote
    */
   renderNote(noteEntity, $form, $notesList = $('.main-notes-list')) {
+    // Let realtime Vue polling handle Changes tab
+    if (window.mrTabs.getCurrentAction() !== 'diffs') {
+      return;
+    }
+
     if (noteEntity.discussion_html) {
       return this.renderDiscussionNote(noteEntity, $form);
     }