diff --git a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
index d05e45e90b36d4703c9ba2599aa94996f2c1b8e6..79a9e1fca8cedcc8eb68fb740e61d8f76f7bc859 100644
--- a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
+++ b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue
@@ -169,6 +169,12 @@ export default {
   methods: {
     filterItemsByStatus(tabIndex) {
       this.resetPagination();
+      const activeStatusTab = this.statusTabs[tabIndex];
+
+      if (activeStatusTab == null) {
+        return;
+      }
+
       const { filters, status } = this.statusTabs[tabIndex];
       this.statusFilter = filters;
       this.filteredByStatus = status;
diff --git a/ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap b/ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap
index 95feac94d65f872f6ffcce541b0518c4804b889c..6b92645b1746da010e1231d3720294e234018b66 100644
--- a/ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap
+++ b/ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap
@@ -25,7 +25,9 @@ exports[`ComplianceDashboard component when there are merge requests and the sho
   </header>
    
   <gl-tabs-stub
+    queryparamname="tab"
     theme="indigo"
+    value="0"
   >
     <b-tab-stub
       tag="div"
diff --git a/ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/policy_preview_spec.js.snap b/ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/policy_preview_spec.js.snap
index bdf36f98452841cad17560612055b81408442b80..904f3b4f77130abe0d67cdf3fb7a0f5f663383ac 100644
--- a/ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/policy_preview_spec.js.snap
+++ b/ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/policy_preview_spec.js.snap
@@ -3,6 +3,7 @@
 exports[`PolicyPreview component with policy description renders policy preview tabs 1`] = `
 <gl-tabs-stub
   contentclass="gl-pt-0"
+  queryparamname="tab"
   theme="indigo"
   value="0"
 >
diff --git a/package.json b/package.json
index 633cdeabadcd9dce1f7033ab6a9a3fb6b0d7a16b..b4bd40a8fd88ed1a4efa1847555e5cd90ab2365e 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/svgs": "1.199.0",
     "@gitlab/tributejs": "1.0.0",
-    "@gitlab/ui": "29.36.0",
+    "@gitlab/ui": "29.37.0",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "6.1.3-2",
     "@rails/ujs": "6.1.3-2",
diff --git a/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap b/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
index 1eb9ccc9c6cee7be37302fa1f27f7fc2955720df..10437c48f88c0a1a15ffa5fa7673b4b5264553f9 100644
--- a/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
+++ b/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
@@ -16,6 +16,7 @@ exports[`AddContextCommitsModal renders modal with 2 tabs 1`] = `
 >
   <gl-tabs-stub
     contentclass="pt-0"
+    queryparamname="tab"
     theme="indigo"
     value="0"
   >
diff --git a/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap b/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
index b59d1597a12fdd8f0b26ce95cf308808964cc78d..118d8ceceb90caf0d8cf58b32af85f6451b087ab 100644
--- a/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
+++ b/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
@@ -13,7 +13,9 @@ exports[`Code navigation popover component renders popover 1`] = `
   <gl-tabs-stub
     contentclass="gl-py-0"
     navclass="gl-hidden"
+    queryparamname="tab"
     theme="indigo"
+    value="0"
   >
     <gl-tab-stub
       title="Definition"
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
index 4f70f908c4a9da2cc58b2569dd6f7b01b8867a9a..1e3c344ce65541ea20234b0c6980c92864e07f57 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
@@ -39,7 +39,9 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
     class="settings-content"
   >
     <gl-tabs-stub
+      queryparamname="tab"
       theme="indigo"
+      value="0"
     >
       <!---->
        
diff --git a/yarn.lock b/yarn.lock
index f86c8d7573653b6a2e90df3da01dce08c38e46d0..46c6932fa687fd0cda6dc76153d5f64ae95d6550 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -908,10 +908,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
   integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
 
-"@gitlab/ui@29.36.0":
-  version "29.36.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.36.0.tgz#a418c34c7ef768552b551807fa2a65deeaeba0bf"
-  integrity sha512-ZsaYpbp5cFN9hxVCf19E7avS9AmMaAyS4/Zwkwu2reHJUOkwyOY24eLr44u/Kbaq6SkFarQ2y+zU8vuhzXwQjQ==
+"@gitlab/ui@29.37.0":
+  version "29.37.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.37.0.tgz#ddfd4760562387f7c164756301f73e29c1a5cd13"
+  integrity sha512-DK+MRhCeAXs7RhbIq7k7z+jTvSoQFfziMgFidmFiyyLYsZRj0+ya2pF9SubxEzH9HKwhs2TNZFd28onO8i5upg==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"