diff --git a/client/src/javascript/components/sidebar/SidebarFilter.tsx b/client/src/javascript/components/sidebar/SidebarFilter.tsx
index 6c7f5077..73fe2937 100644
--- a/client/src/javascript/components/sidebar/SidebarFilter.tsx
+++ b/client/src/javascript/components/sidebar/SidebarFilter.tsx
@@ -35,6 +35,9 @@ class SidebarFilter extends React.Component<SidebarFilterProps> {
         id: 'filter.all',
       });
     } else if (this.props.name === 'untagged') {
+      if (this.props.count === 0) {
+        return null;
+      }
       name = this.props.intl.formatMessage({
         id: 'filter.untagged',
       });