diff --git a/public/app/plugins/panel/barchart/BarChartPanel.tsx b/public/app/plugins/panel/barchart/BarChartPanel.tsx
index 267c5f49b97..2289c9f2428 100755
--- a/public/app/plugins/panel/barchart/BarChartPanel.tsx
+++ b/public/app/plugins/panel/barchart/BarChartPanel.tsx
@@ -252,7 +252,7 @@ export const BarChartPanel: React.FunctionComponent<Props> = ({ data, options, w
       width={width}
       height={height}
     >
-      {(config, alignedFrame) => {
+      {(config) => {
         if (oldConfig.current !== config) {
           oldConfig.current = setupConfig({
             config,
diff --git a/public/app/plugins/panel/barchart/config.ts b/public/app/plugins/panel/barchart/config.ts
index 3cd94e6745d..44652526236 100644
--- a/public/app/plugins/panel/barchart/config.ts
+++ b/public/app/plugins/panel/barchart/config.ts
@@ -33,6 +33,11 @@ export const setupConfig = ({
 }: SetupConfigParams): UPlotConfigBuilder => {
   config.addHook('init', (u) => {
     u.root.parentElement?.addEventListener('click', onUPlotClick);
+    u.over.addEventListener('mouseleave', () => {
+      if (!isToolTipOpen.current) {
+        setCoords(null);
+      }
+    });
   });
 
   let rect: DOMRect;