diff --git a/CHANGELOG.md b/CHANGELOG.md
index a47106613..bfb5361c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
   1. [#1464](https://github.com/influxdata/chronograf/pull/1464): Make Template Variables Manager more space efficient
   1. [#1464](https://github.com/influxdata/chronograf/pull/1464): Add page spinners to pages that did not have them
   1. [#1464](https://github.com/influxdata/chronograf/pull/1464): Denote which source is connected in the Sources table
+  1. [#1478](https://github.com/influxdata/chronograf/pull/1478): InfluxDB dashboard uses milliseconds rather than nanoseconds
 
 ## v1.3.0 [2017-05-09]
 
diff --git a/canned/influxdb_queryExecutor.json b/canned/influxdb_queryExecutor.json
index 944c9653c..a9b538cfc 100644
--- a/canned/influxdb_queryExecutor.json
+++ b/canned/influxdb_queryExecutor.json
@@ -13,16 +13,18 @@
       "name": "InfluxDB - Query Performance",
       "queries": [
         {
-          "query": "SELECT non_negative_derivative(max(\"queryDurationNs\"), 1s) AS \"duration\" FROM \"influxdb_queryExecutor\"",
+          "query": "SELECT non_negative_derivative(max(\"queryDurationNs\"), 1s) / 1000000 AS \"duration_ms\" FROM \"influxdb_queryExecutor\"",
+          "label": "ms",
           "groupbys": [],
           "wheres": []
         },
         {
-          "query": "SELECT non_negative_derivative(max(\"queriesExecuted\"), 1s) AS \"queries_executed\" FROM \"influxdb_queryExecutor\"",
+          "query": "SELECT non_negative_derivative(max(\"queriesExecuted\"), 1s) / 1000000 AS \"queries_executed_ms\" FROM \"influxdb_queryExecutor\"",
+          "label": "ms",
           "groupbys": [],
           "wheres": []
         }
       ]
     }
   ]
-}
+}
\ No newline at end of file