diff --git a/package-lock.json b/package-lock.json
index bb0a845009caff..49a2adcb22ae97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2168,6 +2168,12 @@
 				"equivalent-key-map": "^0.2.2",
 				"lodash": "^4.17.10",
 				"rememo": "^3.0.0"
+			},
+			"dependencies": {
+				"equivalent-key-map": {
+					"version": "0.2.2",
+					"bundled": true
+				}
 			}
 		},
 		"@wordpress/custom-templated-path-webpack-plugin": {
@@ -2187,14 +2193,16 @@
 				"@wordpress/element": "file:packages/element",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/redux-routine": "file:packages/redux-routine",
-<<<<<<< HEAD
-				"equivalent-key-map": "^0.2.0",
-				"is-promise": "^2.1.0",
-=======
 				"equivalent-key-map": "^0.2.2",
->>>>>>> Packages: Bump equivalent-key-map to 0.2.2
+				"is-promise": "^2.1.0",
 				"lodash": "^4.17.10",
 				"redux": "^4.0.0"
+			},
+			"dependencies": {
+				"equivalent-key-map": {
+					"version": "0.2.2",
+					"bundled": true
+				}
 			}
 		},
 		"@wordpress/date": {
@@ -7018,11 +7026,6 @@
 				"lodash": "^4.17.4"
 			}
 		},
-		"equivalent-key-map": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/equivalent-key-map/-/equivalent-key-map-0.2.1.tgz",
-			"integrity": "sha512-dmHJQuM7gMbZexuf9DfZdFUyeCUs2Srpa8Proo1TGC4YAF5UsLO+SNSFDvsf43kFJRLEKxpmGCAFNLOf6OjNPw=="
-		},
 		"errno": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
diff --git a/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js b/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js
index 3beba3c4b76f0f..b4fa8aeee6e6ac 100644
--- a/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js
+++ b/packages/editor/src/components/post-taxonomies/hierarchical-term-selector.js
@@ -205,7 +205,7 @@ class HierarchicalTermSelector extends Component {
 
 		const resultCount = getResultCount( filteredTermsTree );
 		const resultsFoundMessage = sprintf(
-			_n( '%d result found.', '%d results found.', resultCount, 'term' ),
+			_n( '%d result found.', '%d results found.', resultCount ),
 			resultCount
 		);
 		this.props.debouncedSpeak( resultsFoundMessage, 'assertive' );
@@ -321,7 +321,7 @@ class HierarchicalTermSelector extends Component {
 				slug === 'category' ? __( 'Categories' ) : __( 'Terms' )
 			)
 		);
-		const showFilter = availableTerms.length >= MIN_TERMS_COUNT_FOR_FILTER;
+		const showFilter = availableTerms && ( availableTerms.length >= MIN_TERMS_COUNT_FOR_FILTER );
 
 		return [
 			showFilter && <label