diff --git a/package.json b/package.json
index 0c7ba464ce7..129abe4a26f 100644
--- a/package.json
+++ b/package.json
@@ -250,7 +250,7 @@
     "react": "16.12.0",
     "react-dom": "16.12.0",
     "react-grid-layout": "0.17.1",
-    "react-highlight-words": "0.11.0",
+    "react-highlight-words": "0.16.0",
     "react-loadable": "5.5.0",
     "react-popper": "1.3.3",
     "react-redux": "7.1.1",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 20683130d06..28e239397f8 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -55,7 +55,7 @@
     "react-color": "2.18.0",
     "react-custom-scrollbars": "4.2.1",
     "react-dom": "16.12.0",
-    "react-highlight-words": "0.11.0",
+    "react-highlight-words": "0.16.0",
     "react-hook-form": "5.0.3",
     "react-popper": "1.3.3",
     "react-storybook-addon-props-combinations": "1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 7b452b0428b..c58d2683e58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20474,12 +20474,13 @@ react-helmet-async@^1.0.2:
     react-fast-compare "^2.0.4"
     shallowequal "^1.1.0"
 
-react-highlight-words@0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/react-highlight-words/-/react-highlight-words-0.11.0.tgz#4f3c2039a8fd275f3ab795e59946b0324d8e6bee"
-  integrity sha512-b+fgdQXNjX6RwHfiBYn6qH2D2mJEDNLuxdsqRseIiQffoCAoj7naMQ5EktUkmo9Bh1mXq/aMpJbdx7Lf2PytcQ==
+react-highlight-words@0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/react-highlight-words/-/react-highlight-words-0.16.0.tgz#4b4b9824e3d2b98789d3e3b3aedb5e961ae1b7cf"
+  integrity sha512-q34TwCSJOL+5pVDv6LUj3amaoyXdNDwd7zRqVAvceOrO9g1haWLAglK6WkGLMNUa3PFN8EgGedLg/k8Gpndxqg==
   dependencies:
     highlight-words-core "^1.2.0"
+    memoize-one "^4.0.0"
     prop-types "^15.5.8"
 
 react-hook-form@5.0.3:
@@ -21228,6 +21229,11 @@ regexpu-core@^4.7.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
+regextras@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.6.1.tgz#9689641bbb338e0ff7001a5c507c6a2008df7b36"
+  integrity sha512-EzIHww9xV2Kpqx+corS/I7OBmf2rZ0pKKJPsw5Dc+l6Zq1TslDmtRIP9maVn3UH+72MIXmn8zzDgP07ihQogUA==
+
 regextras@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.0.tgz#2298bef8cfb92b1b7e3b9b12aa8f69547b7d71e4"