diff --git a/src/components/filter_group/__snapshots__/filter_button.test.js.snap b/src/components/filter_group/__snapshots__/filter_button.test.js.snap
index b3f7db5b968..58d9b870763 100644
--- a/src/components/filter_group/__snapshots__/filter_button.test.js.snap
+++ b/src/components/filter_group/__snapshots__/filter_button.test.js.snap
@@ -20,3 +20,29 @@ exports[`EuiFilterButton is rendered 1`] = `
   </span>
 </button>
 `;
+
+exports[`EuiFilterButton renders zero properly 1`] = `
+<button
+  aria-label="aria-label"
+  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--iconRight euiFilterButton testClass1 testClass2"
+  data-test-subj="test subject string"
+  type="button"
+>
+  <span
+    class="euiButtonEmpty__content"
+  >
+    <span
+      class="euiButtonEmpty__text"
+    >
+      <span
+        class="euiFilterButton__textShift"
+      />
+      <span
+        class="euiNotificationBadge euiFilterButton__notification"
+      >
+        0
+      </span>
+    </span>
+  </span>
+</button>
+`;
diff --git a/src/components/filter_group/filter_button.js b/src/components/filter_group/filter_button.js
index d9675bda387..445edd09dc9 100644
--- a/src/components/filter_group/filter_button.js
+++ b/src/components/filter_group/filter_button.js
@@ -52,7 +52,7 @@ export const EuiFilterButton = ({
       <span className="euiFilterButton__textShift" data-text={children}>
         {children}
       </span>
-      {numFilters &&
+      {numFilters != null &&
         <EuiNotificationBadge className="euiFilterButton__notification">{numFilters}</EuiNotificationBadge>
       }
     </Fragment>
diff --git a/src/components/filter_group/filter_button.test.js b/src/components/filter_group/filter_button.test.js
index 3a0063dd679..0a3ccf52b7f 100644
--- a/src/components/filter_group/filter_button.test.js
+++ b/src/components/filter_group/filter_button.test.js
@@ -13,4 +13,12 @@ describe('EuiFilterButton', () => {
     expect(component)
       .toMatchSnapshot();
   });
+
+  test('renders zero properly', () => {
+    const component = render(
+      <EuiFilterButton {...requiredProps} numFilters={0} />
+    );
+
+    expect(component).toMatchSnapshot();
+  });
 });