diff --git a/CHANGELOG.md b/CHANGELOG.md
index 773110b2523..1a165a38eee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Bugfixes
 * **Server-side rendering**: Fixed address used when rendering panel via phantomjs and using non default http_addr config [#6660](https://github.com/grafana/grafana/issues/6660)
+* **Graph panel**: Fixed graph panel tooltip sort order issue [#6648](https://github.com/grafana/grafana/issues/6648)
 
 # 4.0-beta2 (2016-11-21)
 
diff --git a/public/app/plugins/panel/graph/graph_tooltip.js b/public/app/plugins/panel/graph/graph_tooltip.js
index e3c5a1edf85..91ea556d9dc 100644
--- a/public/app/plugins/panel/graph/graph_tooltip.js
+++ b/public/app/plugins/panel/graph/graph_tooltip.js
@@ -181,10 +181,6 @@ function ($) {
           seriesHoverInfo.sort(function(a, b) {
             return a.value - b.value;
           });
-        } else {
-          seriesHoverInfo.sort(function(a, b) {
-            return a.yaxis - b.yaxis;
-          });
         }
 
         for (i = 0; i < seriesHoverInfo.length; i++) {