diff --git a/public/app/plugins/datasource/influxdb_08/datasource.js b/public/app/plugins/datasource/influxdb_08/datasource.js
index 5dabc93efa0..0bfa3f84527 100644
--- a/public/app/plugins/datasource/influxdb_08/datasource.js
+++ b/public/app/plugins/datasource/influxdb_08/datasource.js
@@ -266,11 +266,11 @@ function (angular, _, dateMath, InfluxSeries, InfluxQueryBuilder) {
     }
 
     function getInfluxTime(date, roundUp) {
-      if (_.isString(date) && date.indexOf('/') === -1) {
+      if (_.isString(date)) {
         if (date === 'now') {
           return 'now()';
         }
-        if (date.indexOf('now-') >= 0) {
+        if (date.indexOf('now-') >= 0 && date.indexOf('/') === -1) {
           return date.replace('now', 'now()');
         }
         date = dateMath.parse(date, roundUp);