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