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 58d9b870763..c1d92976156 100644
--- a/src/components/filter_group/__snapshots__/filter_button.test.js.snap
+++ b/src/components/filter_group/__snapshots__/filter_button.test.js.snap
@@ -32,7 +32,7 @@ exports[`EuiFilterButton renders zero properly 1`] = `
     class="euiButtonEmpty__content"
   >
     <span
-      class="euiButtonEmpty__text"
+      class="euiButtonEmpty__text euiFilterButton__text-hasNotification"
     >
       <span
         class="euiFilterButton__textShift"
diff --git a/src/components/filter_group/filter_button.js b/src/components/filter_group/filter_button.js
index 445edd09dc9..bfee8d15f9b 100644
--- a/src/components/filter_group/filter_button.js
+++ b/src/components/filter_group/filter_button.js
@@ -42,8 +42,10 @@ export const EuiFilterButton = ({
     className,
   );
 
+  // != instead of !== to allow for null and undefined
+  const numFiltersDefined = numFilters != null;
   const buttonTextClassNames = classNames(
-    { 'euiFilterButton__text-hasNotification': numFilters, },
+    { 'euiFilterButton__text-hasNotification': numFiltersDefined, },
     textProps && textProps.className,
   );
 
@@ -52,7 +54,7 @@ export const EuiFilterButton = ({
       <span className="euiFilterButton__textShift" data-text={children}>
         {children}
       </span>
-      {numFilters != null &&
+      {numFiltersDefined &&
         <EuiNotificationBadge className="euiFilterButton__notification">{numFilters}</EuiNotificationBadge>
       }
     </Fragment>