diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index fa8563e1aef..f1f602b427e 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -85,7 +85,7 @@
     "rc-drawer": "6.3.0",
     "rc-slider": "10.2.1",
     "rc-time-picker": "^3.7.3",
-    "rc-tooltip": "5.3.1",
+    "rc-tooltip": "6.0.1",
     "react-beautiful-dnd": "13.1.1",
     "react-calendar": "4.0.0",
     "react-colorful": "5.6.1",
diff --git a/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx b/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
index 034f01348b1..bd195649b08 100644
--- a/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
+++ b/packages/grafana-ui/src/components/Slider/HandleTooltip.tsx
@@ -6,10 +6,10 @@ import { GrafanaTheme2 } from '@grafana/data';
 
 import { useStyles2 } from '../../themes/ThemeContext';
 
+// this is now typed in rc-tooltip, but they don't export it :(
+// let's mirror the interface here. if there's any discrepancy, we'll get a type error
 interface RCTooltipRef {
-  // rc-tooltip's ref is essentially untyped, so we be cautious by saying the function is
-  // potentially undefined which, given rc's track record, seems likely :)
-  forcePopupAlign?: () => {};
+  forceAlign: () => {};
 }
 
 const HandleTooltip = (props: {
@@ -21,7 +21,7 @@ const HandleTooltip = (props: {
 }) => {
   const { value, children, visible, placement, tipFormatter, ...restProps } = props;
 
-  const tooltipRef = useRef<RCTooltipRef>();
+  const tooltipRef = useRef<RCTooltipRef>(null);
   const rafRef = useRef<number | null>(null);
   const styles = useStyles2(tooltipStyles);
 
@@ -33,7 +33,7 @@ const HandleTooltip = (props: {
 
   function keepAlign() {
     rafRef.current = requestAnimationFrame(() => {
-      tooltipRef.current?.forcePopupAlign?.();
+      tooltipRef.current?.forceAlign();
     });
   }
 
diff --git a/yarn.lock b/yarn.lock
index 73fab7e968c..d6d4549e9d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4200,7 +4200,7 @@ __metadata:
     rc-drawer: 6.3.0
     rc-slider: 10.2.1
     rc-time-picker: ^3.7.3
-    rc-tooltip: 5.3.1
+    rc-tooltip: 6.0.1
     react: 18.2.0
     react-beautiful-dnd: 13.1.1
     react-calendar: 4.0.0
@@ -6776,6 +6776,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rc-component/trigger@npm:^1.0.4":
+  version: 1.14.1
+  resolution: "@rc-component/trigger@npm:1.14.1"
+  dependencies:
+    "@babel/runtime": ^7.18.3
+    "@rc-component/portal": ^1.1.0
+    classnames: ^2.3.2
+    rc-align: ^4.0.0
+    rc-motion: ^2.0.0
+    rc-resize-observer: ^1.3.1
+    rc-util: ^5.33.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 51355dee2ff651e8a3333b01dbfcfcda64c149ee1396830d8d3c16be2bb2a518fe8625f94528f071b54231be6c339d90391cf22310d1b4341d0c778c42bfc678
+  languageName: node
+  linkType: hard
+
 "@rc-component/trigger@npm:^1.5.0":
   version: 1.9.0
   resolution: "@rc-component/trigger@npm:1.9.0"
@@ -27044,17 +27062,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-tooltip@npm:5.3.1":
-  version: 5.3.1
-  resolution: "rc-tooltip@npm:5.3.1"
+"rc-tooltip@npm:6.0.1":
+  version: 6.0.1
+  resolution: "rc-tooltip@npm:6.0.1"
   dependencies:
     "@babel/runtime": ^7.11.2
+    "@rc-component/trigger": ^1.0.4
     classnames: ^2.3.1
-    rc-trigger: ^5.3.1
   peerDependencies:
     react: ">=16.9.0"
     react-dom: ">=16.9.0"
-  checksum: 93a99dd8f83ca6187cae7d09e498156e660331837f7ff16d6c50165e5cbc810d566552535d8c92c6fb3093f45cadfa0b62a03b9f78ba22e8b6123eda27333cf4
+  checksum: fe7f617a4f4e0085d8f5eb5e8da5598f0164841c841f62f77966706ae604491246441a469aeb44f1dec7001bb4716ee81d11ec646e8889f4164fcba3a024eea5
   languageName: node
   linkType: hard
 
@@ -27105,22 +27123,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-trigger@npm:^5.3.1":
-  version: 5.3.4
-  resolution: "rc-trigger@npm:5.3.4"
-  dependencies:
-    "@babel/runtime": ^7.18.3
-    classnames: ^2.2.6
-    rc-align: ^4.0.0
-    rc-motion: ^2.0.0
-    rc-util: ^5.19.2
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 6ca7694a4cf064040b5e0fd9b4629b0e0a19ebb29c4eb5614ee9eb22b4193e21909171fd95e48be73a94e44f249cb9616d7670b696164620b722d3de6f280017
-  languageName: node
-  linkType: hard
-
 "rc-util@npm:^4.0.4, rc-util@npm:^4.15.3, rc-util@npm:^4.4.0":
   version: 4.21.1
   resolution: "rc-util@npm:4.21.1"
@@ -27148,20 +27150,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-util@npm:^5.19.2, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.24.4":
-  version: 5.24.4
-  resolution: "rc-util@npm:5.24.4"
-  dependencies:
-    "@babel/runtime": ^7.18.3
-    react-is: ^16.12.0
-    shallowequal: ^1.1.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: efda306dcf9eeb0df6d3a8d315d18ec73c653d463174355bd91d34f4d42acc092b2d6ffee47993312841ea4d13b4fe036c764a3a46fa935f307d51a8807e2c10
-  languageName: node
-  linkType: hard
-
 "rc-util@npm:^5.2.1, rc-util@npm:^5.3.0":
   version: 5.14.0
   resolution: "rc-util@npm:5.14.0"
@@ -27176,6 +27164,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.24.4":
+  version: 5.24.4
+  resolution: "rc-util@npm:5.24.4"
+  dependencies:
+    "@babel/runtime": ^7.18.3
+    react-is: ^16.12.0
+    shallowequal: ^1.1.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: efda306dcf9eeb0df6d3a8d315d18ec73c653d463174355bd91d34f4d42acc092b2d6ffee47993312841ea4d13b4fe036c764a3a46fa935f307d51a8807e2c10
+  languageName: node
+  linkType: hard
+
 "rc-util@npm:^5.27.0":
   version: 5.28.0
   resolution: "rc-util@npm:5.28.0"
@@ -27202,6 +27204,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rc-util@npm:^5.33.0":
+  version: 5.34.1
+  resolution: "rc-util@npm:5.34.1"
+  dependencies:
+    "@babel/runtime": ^7.18.3
+    react-is: ^16.12.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: ef4f0834db975ff77b1940c32f7ab75e201e06e16218dfc993066e994a0199330f433ab8587ab0a49101aa94ac009f8d553e3e8818185d9b6889e62791c77a16
+  languageName: node
+  linkType: hard
+
 "rc-virtual-list@npm:^3.4.8":
   version: 3.4.8
   resolution: "rc-virtual-list@npm:3.4.8"