diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index 0942f4c80ef..193d0101b76 100755
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -359,7 +359,7 @@ function (angular, $, kbn, moment, _) {
               j=0;
               do {
                 ++j;
-              } while (series.data[j][0] < pos.x);
+              } while (series.data[j][0] < pos.x && j<series.length);
               j--; //we take previous value in time.
               //now we know the current X (j) position for X and Y values
               timestamp = dashboard.formatDate(series.data[j][0]);