diff --git a/public/app/panels/graph/graph.tooltip.js b/public/app/panels/graph/graph.tooltip.js
index 724588c4fd5..33c29e4e14a 100644
--- a/public/app/panels/graph/graph.tooltip.js
+++ b/public/app/panels/graph/graph.tooltip.js
@@ -82,14 +82,17 @@ function ($) {
     };
 
     elem.mouseleave(function () {
-      if (scope.panel.tooltip.shared || dashboard.sharedCrosshair) {
+      if (scope.panel.tooltip.shared) {
         var plot = elem.data().plot;
         if (plot) {
           $tooltip.detach();
           plot.unhighlight();
-          scope.appEvent('clearCrosshair');
         }
       }
+
+      if (dashboard.sharedCrosshair) {
+        scope.appEvent('clearCrosshair');
+      }
     });
 
     elem.bind("plothover", function (event, pos, item) {