diff --git a/CHANGELOG.md b/CHANGELOG.md
index a33af7378c1..077f2046d0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 **Bug fixes**
 
 - Fixed `SuperDatePicker` from crashing due to invalid time input ([#5263](https://github.com/elastic/eui/pull/5263))
+- Fixed content in `EuiFilterButton` again when `numFilters` is undefined ([#5268](https://github.com/elastic/eui/pull/5268))
 
 ## [`39.1.0`](https://github.com/elastic/eui/tree/v39.1.0)
 
diff --git a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
index 689e53e97eb..e0595f5d9cd 100644
--- a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
+++ b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
@@ -217,3 +217,24 @@ exports[`EuiFilterButton renders zero properly 1`] = `
   </span>
 </button>
 `;
+
+exports[`EuiFilterButton does not render a badge or count if numFilters is not passed 1`] = `
+<button
+  aria-label="aria-label"
+  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton testClass1 testClass2"
+  data-test-subj="test subject string"
+  type="button"
+>
+  <span
+    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+  >
+    <span
+      class="euiButtonEmpty__text"
+    >
+      <span
+        class="euiFilterButton__textShift"
+      />
+    </span>
+  </span>
+</button>
+`;
diff --git a/src/components/filter_group/filter_button.test.tsx b/src/components/filter_group/filter_button.test.tsx
index b26bbaca84f..c9a2ccb83de 100644
--- a/src/components/filter_group/filter_button.test.tsx
+++ b/src/components/filter_group/filter_button.test.tsx
@@ -21,7 +21,15 @@ describe('EuiFilterButton', () => {
 
   test('renders zero properly', () => {
     const component = render(
-      <EuiFilterButton {...requiredProps} numFilters={0} />
+      <EuiFilterButton {...requiredProps} numFilters={0} numActiveFilters={0} />
+    );
+
+    expect(component).toMatchSnapshot();
+  });
+
+  test('does not render a badge or count if numFilters is not passed', () => {
+    const component = render(
+      <EuiFilterButton {...requiredProps} numActiveFilters={0} />
     );
 
     expect(component).toMatchSnapshot();
diff --git a/src/components/filter_group/filter_button.tsx b/src/components/filter_group/filter_button.tsx
index a087cef5110..9a79cd997ea 100644
--- a/src/components/filter_group/filter_button.tsx
+++ b/src/components/filter_group/filter_button.tsx
@@ -68,7 +68,8 @@ export const EuiFilterButton: FunctionComponent<EuiFilterButtonProps> = ({
   ...rest
 }) => {
   const numFiltersDefined = numFilters != null; // != instead of !== to allow for null and undefined
-  const numActiveFiltersDefined = numActiveFilters && numActiveFilters > 0;
+  const numActiveFiltersDefined =
+    numActiveFilters != null && numActiveFilters > 0;
 
   const classes = classNames(
     'euiFilterButton',