diff --git a/app/assets/javascripts/merge_request_dashboard/components/app.vue b/app/assets/javascripts/merge_request_dashboard/components/app.vue
index aaa9c1a2c2c3eda60dae3f55fca728c401c9dd77..2d1e02a99d36ea725215b643446f5c9608113cc9 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/app.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/app.vue
@@ -99,10 +99,11 @@ export default {
       this.$router.push({ path: key || '/' });
     },
     queriesForTab(tab) {
-      return tab.lists
-        .flat()
-        .filter((l) => !l.hideCount)
-        .map((list) => ({ query: list.query, variables: list.variables }));
+      return tab.lists.flat().map((list) => ({
+        hideCount: list.hideCount,
+        query: list.query,
+        variables: list.variables,
+      }));
     },
   },
   mergeRequestIllustration,
@@ -158,7 +159,6 @@ export default {
             :key="`list_${list.id}`"
             :query="list.query"
             :variables="list.variables"
-            :hide-count="list.hideCount"
             :is-visible="isVisible"
           >
             <template
diff --git a/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue b/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue
index ff99dd58a9037765a385d52917c097f661945a66..cb54b62cfd518556401ceccb0690ab6c07d492a1 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue
@@ -55,9 +55,6 @@ export default {
         return this.mergeRequestQueryVariables;
       },
       fetchPolicy: fetchPolicies.CACHE_ONLY,
-      skip() {
-        return this.hideCount;
-      },
     },
     draftsCount: {
       fetchPolicy: fetchPolicies.NO_CACHE,
@@ -86,11 +83,6 @@ export default {
       required: false,
       default: () => ({}),
     },
-    hideCount: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     isVisible: {
       type: Boolean,
       required: false,
@@ -154,9 +146,7 @@ export default {
         ),
       });
 
-      if (!this.hideCount) {
-        this.$apollo.queries.count.refetch();
-      }
+      this.$apollo.queries.count.refetch();
     },
     async loadMore() {
       this.loading = true;
diff --git a/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue b/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue
index 8526f0e7cda4cd4eab6aea3dbbc0adb55a674651..b827264a37ef0e0808a0caf43930b962a281a6e7 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue
@@ -25,27 +25,33 @@ export default {
     this.fetchAllCounts();
   },
   methods: {
-    fetchAllCounts() {
-      this.queries.forEach(({ query, variables }, index) => {
-        const countVariables = { ...variables };
+    addSmartQuery({ index, query, variables, hideCount }) {
+      const countVariables = { ...variables };
 
-        if (countVariables.draft) {
-          delete countVariables.draft;
-        }
+      if (countVariables.draft) {
+        delete countVariables.draft;
+      }
 
-        this.$apollo.addSmartQuery(`${query}_${index}`, {
-          query: QUERIES[query].countQuery,
-          variables: countVariables,
-          manual: true,
-          context: { batchKey: `MergeRequestTabsCounts_${camelCase(this.title)}` },
-          result({ data }) {
-            if (data?.currentUser) {
+      this.$apollo.addSmartQuery(`${query}_${index}`, {
+        query: QUERIES[query].countQuery,
+        variables: countVariables,
+        manual: true,
+        context: {
+          batchKey: `MergeRequestTabsCounts_${camelCase(this.title)}_${hideCount ? 'NOT_ACTIVE' : 'ACTIVE'}`,
+        },
+        result({ data }) {
+          if (data?.currentUser) {
+            if (!hideCount) {
               this.count += data?.currentUser?.mergeRequests?.count ?? 0;
-
               this.loading = false;
             }
-          },
-        });
+          }
+        },
+      });
+    },
+    fetchAllCounts() {
+      this.queries.forEach(({ query, variables, hideCount }, index) => {
+        this.addSmartQuery({ index, query, variables, hideCount });
       });
     },
   },
diff --git a/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js b/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js
index 6ff41817193a627c7f2fa1881eb0980202ba5a76..22b76845a5b9fd6848980fb71007a0dc80005c4e 100644
--- a/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js
+++ b/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js
@@ -76,6 +76,12 @@ describe('Merge requests query component', () => {
       { typePolicies: { Query: { fields: { currentUser: { merge: false } } } } },
     );
 
+    apolloProvider.defaultClient.writeQuery({
+      query: assigneeCountQuery,
+      variables: { state: 'opened' },
+      data: { currentUser: { id: 1, mergeRequests: { count: 1 } } },
+    });
+
     slotSpy = jest.fn();
 
     shallowMountExtended(MergeRequestQuery, {
@@ -113,16 +119,19 @@ describe('Merge requests query component', () => {
     });
   });
 
-  it('does not call count query if hideCount is true', async () => {
+  it('renders default slot with the cached merge requests count', async () => {
     createComponent({
       query: 'assignedMergeRequests',
       variables: { state: 'opened' },
-      hideCount: true,
     });
 
     await waitForPromises();
 
-    expect(assigneeCountQueryMock).not.toHaveBeenCalled();
+    expect(slotSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        count: 1,
+      }),
+    );
   });
 
   it.each([