diff --git a/frontend/web/components/TagSelect.js b/frontend/web/components/TagSelect.js
index 3f243c35db65..503a1e936dcd 100644
--- a/frontend/web/components/TagSelect.js
+++ b/frontend/web/components/TagSelect.js
@@ -66,7 +66,7 @@ class TagSelect extends PureComponent {
                                     }
                                 }} style={{ marginBottom: 10 }} className="btn--link mr-2"
                             >
-                                Toggle all
+                                Clear Filters
                             </Button>
                         )}
                     </Row>
diff --git a/frontend/web/components/pages/FeaturesPage.js b/frontend/web/components/pages/FeaturesPage.js
index ff13102a0c7d..aa2679c24f1d 100644
--- a/frontend/web/components/pages/FeaturesPage.js
+++ b/frontend/web/components/pages/FeaturesPage.js
@@ -196,7 +196,7 @@ const FeaturesPage = class extends Component {
                                                                   <Row className="px-0 pt-0 pb-2">
                                                                       <TagSelect
                                                                         showUntagged
-                                                                        showClearAll
+                                                                        showClearAll={this.state.tags && !!this.state.tags.length}
                                                                         projectId={projectId} value={this.state.tags} onChange={(tags) => {
                                                                             this.setState({ tags });
                                                                             AsyncStorage.setItem(`${projectId}tags`, JSON.stringify(tags));