diff --git a/influx/query.go b/influx/query.go
index <HASH>..<HASH> 100644
--- a/influx/query.go
+++ b/influx/query.go
@@ -21,6 +21,10 @@ func Convert(influxQL string) (chronograf.QueryConfig, error) {
 		return chronograf.QueryConfig{}, err
 	}
 
+	if itsDashboardTime {
+		influxQL = strings.Replace(influxQL, "now() - 15m", ":dashboardTime:", 1)
+	}
+
 	raw := chronograf.QueryConfig{
 		RawText: &influxQL,
 		Fields:  []chronograf.Field{},
After the query is parsed, return to :dashboardTime: