diff --git a/package.json b/package.json
index 87c3f139dc7..110ba29ee75 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "@testing-library/user-event": "13.5.0",
     "@types/angular": "1.8.3",
     "@types/angular-route": "1.7.0",
-    "@types/classnames": "2.2.9",
+    "@types/classnames": "2.3.0",
     "@types/clipboard": "2.0.1",
     "@types/common-tags": "^1.8.0",
     "@types/d3": "7.1.0",
@@ -268,7 +268,7 @@
     "brace": "0.11.1",
     "calculate-size": "1.1.1",
     "centrifuge": "2.7.5",
-    "classnames": "2.2.6",
+    "classnames": "2.3.1",
     "clipboard": "2.0.4",
     "comlink": "4.3.1",
     "common-tags": "^1.8.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 1cffd16b7a9..bb66723137a 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -47,7 +47,7 @@
     "@sentry/browser": "6.15.0",
     "ansicolor": "1.1.95",
     "calculate-size": "1.1.1",
-    "classnames": "2.2.6",
+    "classnames": "2.3.1",
     "clipboard": "2.0.4",
     "core-js": "3.10.0",
     "d3": "5.15.0",
@@ -118,7 +118,7 @@
     "@testing-library/react": "12.1.2",
     "@testing-library/react-hooks": "7.0.2",
     "@testing-library/user-event": "13.5.0",
-    "@types/classnames": "2.2.7",
+    "@types/classnames": "2.3.0",
     "@types/clipboard": "2.0.1",
     "@types/common-tags": "^1.8.0",
     "@types/d3": "7.1.0",
diff --git a/yarn.lock b/yarn.lock
index d14b80482ab..c35e622f778 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,7 +3700,7 @@ __metadata:
     "@testing-library/react": 12.1.2
     "@testing-library/react-hooks": 7.0.2
     "@testing-library/user-event": 13.5.0
-    "@types/classnames": 2.2.7
+    "@types/classnames": 2.3.0
     "@types/clipboard": 2.0.1
     "@types/common-tags": ^1.8.0
     "@types/d3": 7.1.0
@@ -3736,7 +3736,7 @@ __metadata:
     ansicolor: 1.1.95
     babel-loader: 8.2.2
     calculate-size: 1.1.1
-    classnames: 2.2.6
+    classnames: 2.3.1
     clipboard: 2.0.4
     common-tags: ^1.8.0
     core-js: 3.10.0
@@ -8383,21 +8383,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/classnames@npm:2.2.7":
-  version: 2.2.7
-  resolution: "@types/classnames@npm:2.2.7"
-  checksum: f94e9610ff424863f14398a8ad9c23025a8d54a372fa6bb333329ff2f77a29e1e0be0747f0fc3261c390c66f8643ea5aaa83ba8008e236b2962b071b3ca2ddee
-  languageName: node
-  linkType: hard
-
-"@types/classnames@npm:2.2.9":
-  version: 2.2.9
-  resolution: "@types/classnames@npm:2.2.9"
-  checksum: df4a984dd287dfc22f3b7ba3d7746e0daf0349b1f6ff053ce1bfe0a753bbf58aca347873a33e309e7c11b00ab6e65eeea399521f95500904cd87c3fca316607b
-  languageName: node
-  linkType: hard
-
-"@types/classnames@npm:^2.2.7":
+"@types/classnames@npm:2.3.0, @types/classnames@npm:^2.2.7":
   version: 2.3.0
   resolution: "@types/classnames@npm:2.3.0"
   dependencies:
@@ -13525,13 +13511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"classnames@npm:2.2.6":
-  version: 2.2.6
-  resolution: "classnames@npm:2.2.6"
-  checksum: 09a4fda780158aa8399079898eabeeca0c48c28641d9e4de140db7412e5e346843039ded1af0152f755afc2cc246ff8c3d6f227bf0dcb004e070b7fa14ec54cc
-  languageName: node
-  linkType: hard
-
 "clean-css@npm:4.2.x, clean-css@npm:^4.2.3":
   version: 4.2.4
   resolution: "clean-css@npm:4.2.4"
@@ -19109,7 +19088,7 @@ __metadata:
     "@testing-library/user-event": 13.5.0
     "@types/angular": 1.8.3
     "@types/angular-route": 1.7.0
-    "@types/classnames": 2.2.9
+    "@types/classnames": 2.3.0
     "@types/clipboard": 2.0.1
     "@types/common-tags": ^1.8.0
     "@types/d3": 7.1.0
@@ -19183,7 +19162,7 @@ __metadata:
     brace: 0.11.1
     calculate-size: 1.1.1
     centrifuge: 2.7.5
-    classnames: 2.2.6
+    classnames: 2.3.1
     clipboard: 2.0.4
     comlink: 4.3.1
     common-tags: ^1.8.0