diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2357c39c5fa..1580a367da8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [BUG][Data] Fix empty suggestion history when querying in search bar [#5349](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5349)
 - [BUG][Discover] Fix what is displayed in `selected fields` when removing columns from canvas [#5537](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5537)
 - [BUG][Discover] Fix advanced setting `discover:modifyColumnsOnSwitch` ([#5508](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5508))
+- [BUG][Discover] Show 0 filters when there are no active filters ([#5508](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5508))
 - [Discover] Fix missing index pattern field from breaking Discover [#5626](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5626)
 - [BUG] Remove duplicate sample data as id 90943e30-9a47-11e8-b64d-95841ca0b247 ([5668](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5668))
 - [BUG][Multiple Datasource] Fix datasource testing connection unexpectedly passed with wrong endpoint [#5663](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5663)
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx
index bcf72ae57326..807b8b98b3f4 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx
@@ -83,7 +83,7 @@ describe('DiscoverFieldSearch', () => {
     btn = findTestSubject(component, 'toggleFieldFilterButton');
     const badge = btn.find('.euiNotificationBadge');
     // available filters
-    expect(badge.text()).toEqual(NUM_FILTERS.toString());
+    expect(badge.text()).toEqual('0');
     // change value of aggregatable select
     const aggregatableButtonGroup = findButtonGroup(component, 'aggregatable');
     act(() => {
@@ -114,10 +114,10 @@ describe('DiscoverFieldSearch', () => {
     const btn = findTestSubject(component, 'toggleFieldFilterButton');
     btn.simulate('click');
     const badge = btn.find('.euiNotificationBadge');
-    expect(badge.text()).toEqual(NUM_FILTERS.toString());
+    expect(badge.text()).toEqual('0');
     const missingSwitch = findTestSubject(component, 'missingSwitch');
     missingSwitch.simulate('change', { target: { value: false } });
-    expect(badge.text()).toEqual(NUM_FILTERS.toString());
+    expect(badge.text()).toEqual('0');
   });
 
   test('change in filters triggers onChange', () => {
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx
index 8d90e0ae1099..4b50c44b3235 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx
@@ -273,7 +273,7 @@ export function DiscoverFieldSearch({ onChange, value, types }: Props) {
                 hasActiveFilters={activeFiltersCount > 0}
                 aria-label={filterBtnAriaLabel}
                 data-test-subj="toggleFieldFilterButton"
-                numFilters={NUM_FILTERS}
+                numFilters={activeFiltersCount} // {NUM_FILTERS} https://github.com/opensearch-project/oui/issues/1219
                 onClick={handleFacetButtonClicked}
                 numActiveFilters={activeFiltersCount}
                 isSelected={isPopoverOpen}