diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 04be1894073..a6d4459c7ff 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -275,12 +275,7 @@ export default class InfluxDatasource {
       }
       date = dateMath.parse(date, roundUp);
     }
-
-    var secs = date.valueOf() / 1000;
-    if (roundUp) {
-      secs += 1;
-    }
-    return secs.toFixed(0) + 's';
+    return date.valueOf() + 'ms';
   }
 }