1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js
index c43430639ad..62d991c2d9e 100644
--- a/app/assets/javascripts/notes/stores/getters.js
+++ b/app/assets/javascripts/notes/stores/getters.js
@@ -2,7 +2,7 @@ import { flattenDeep, clone } from 'lodash';
 import { match } from '~/diffs/utils/diff_file';
 import { isInMRPage } from '~/lib/utils/common_utils';
 import { doesHashExistInUrl } from '~/lib/utils/url_utility';
-import { badgeState } from '~/merge_requests/components/merge_request_status_badge.vue';
+import { badgeState } from '~/merge_requests/components/merge_request_header.vue';
 import * as constants from '../constants';
 import { collapseSystemNotes } from './collapse_utils';
 
@@ -52,10 +52,7 @@ export const discussions = (state, getters, rootState) => {
   let discussionsInState = clone(state.discussions);
   // NOTE: not testing bc will be removed when backend is finished.
 
-  if (
-    state.noteableData.targetType === 'merge_request' &&
-    window.gon?.features?.mrActivityFilters
-  ) {
+  if (state.noteableData.targetType === 'merge_request') {
     discussionsInState = discussionsInState.reduce((acc, discussion) => {
       if (hideActivity(state.mergeRequestFilters, discussion)) {
         return acc;