diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts
index fef4efdd373..e17d4c53f5a 100644
--- a/public/app/core/time_series2.ts
+++ b/public/app/core/time_series2.ts
@@ -171,9 +171,11 @@ export default class TimeSeries {
 
   isMsResolutionNeeded() {
     for (var i = 0; i<this.datapoints.length; i++) {
-      var timestamp = this.datapoints[i][0].toString();
-      if (timestamp.length === 13 && (timestamp % 1000) !== 0) {
-        return true;
+      if (this.datapoints[i][0] !== null) {
+        var timestamp = this.datapoints[i][0].toString();
+        if (timestamp.length === 13 && (timestamp % 1000) !== 0) {
+          return true;
+        }
       }
     }
     return false;
diff --git a/public/test/core/time_series_specs.js b/public/test/core/time_series_specs.js
index 5d6950ad2b6..9d273c86b94 100644
--- a/public/test/core/time_series_specs.js
+++ b/public/test/core/time_series_specs.js
@@ -56,6 +56,26 @@ define([
       });
     });
 
+    describe('can detect if serie contains ms precision', function() {
+      var fakedata;
+
+      beforeEach(function() {
+        fakedata = testData;
+      });
+
+      it('missing datapoint with ms precision', function() {
+        fakedata.datapoints[0] = [1234567890000, 1337];
+        series = new TimeSeries(fakedata);
+        expect(series.isMsResolutionNeeded()).to.be(false);
+      });
+
+      it('contains datapoint with ms precision', function() {
+        fakedata.datapoints[0] = [1236547890001, 1337];
+        series = new TimeSeries(fakedata);
+        expect(series.isMsResolutionNeeded()).to.be(true);
+      });
+    });
+
     describe('series overrides', function() {
       var series;
       beforeEach(function() {
@@ -148,7 +168,5 @@ define([
       });
 
     });
-
   });
-
 });