diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index b2f4296dc69..dbfa71c75bd 100644
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -269,11 +269,11 @@ function (angular, $, kbn, moment, _) {
           if(_int >= 10000) {
             return "%Y-%m-%d";
           }
-          if(_int >= 60) {
+          if(_int >= 700) {
             return "%H:%M<br>%m-%d";
           }
 
-          return "%H:%M:%S";
+          return "%H:%M";
         }
 
         var $tooltip = $('<div>');