diff --git a/plugins/woocommerce-admin/client/components/filters/advanced/index.js b/plugins/woocommerce-admin/client/components/filters/advanced/index.js
index dceb00741fe..4f070b0308d 100644
--- a/plugins/woocommerce-admin/client/components/filters/advanced/index.js
+++ b/plugins/woocommerce-admin/client/components/filters/advanced/index.js
@@ -229,9 +229,11 @@ class AdvancedFilters extends Component {
 							{ __( 'Filter', 'wc-admin' ) }
 						</Link>
 					) }
-					<Link type="wc-admin" href={ this.getUpdateHref( [] ) } onClick={ this.clearFilters }>
-						{ __( 'Clear all filters', 'wc-admin' ) }
-					</Link>
+					{ activeFilters.length > 0 && (
+						<Link type="wc-admin" href={ this.getUpdateHref( [] ) } onClick={ this.clearFilters }>
+							{ __( 'Clear all filters', 'wc-admin' ) }
+						</Link>
+					) }
 				</div>
 			</Card>
 		);
diff --git a/plugins/woocommerce-admin/client/components/filters/compare/index.js b/plugins/woocommerce-admin/client/components/filters/compare/index.js
index 1c1f5c342e9..68cb390aed7 100644
--- a/plugins/woocommerce-admin/client/components/filters/compare/index.js
+++ b/plugins/woocommerce-admin/client/components/filters/compare/index.js
@@ -4,6 +4,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
+import { Button } from '@wordpress/components';
 import { isEqual } from 'lodash';
 import PropTypes from 'prop-types';
 
@@ -12,8 +13,7 @@ import PropTypes from 'prop-types';
  */
 import Card from 'components/card';
 import CompareButton from './button';
-import Link from 'components/link';
-import { getIdsFromQuery, getNewPath, updateQueryString } from 'lib/nav-utils';
+import { getIdsFromQuery, updateQueryString } from 'lib/nav-utils';
 import Search from 'components/search';
 
 /**
@@ -54,7 +54,12 @@ class CompareFilter extends Component {
 
 	clearQuery() {
 		const { param, path, query } = this.props;
-		return getNewPath( { [ param ]: undefined }, path, query );
+
+		this.setState( {
+			selected: [],
+		} );
+
+		updateQueryString( { [ param ]: undefined }, path, query );
 	}
 
 	updateLabels( selected ) {
@@ -91,9 +96,11 @@ class CompareFilter extends Component {
 					>
 						{ labels.update }
 					</CompareButton>
-					<Link type="wc-admin" href={ this.clearQuery() }>
-						{ __( 'Clear all', 'wc-admin' ) }
-					</Link>
+					{ selected.length > 0 && (
+						<Button isLink={ true } onClick={ this.clearQuery }>
+							{ __( 'Clear all', 'wc-admin' ) }
+						</Button>
+					) }
 				</div>
 			</Card>
 		);