diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae9542d10e..bb363195b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@
   1. [#1455](https://github.com/influxdata/chronograf/issues/1455): Fix backwards sort arrows in tables
   1. [#1423](https://github.com/influxdata/chronograf/issues/1423): Make logout nav item consistent with design
   1. [#1426](https://github.com/influxdata/chronograf/issues/1426): Fix graph loading spinner
-  1. [#1485](https://github.com/influxdata/chronograf/issues/1485): Filter out any template variable values that are empty, whitespace, or duplicates
+  1. [#1485](https://github.com/influxdata/chronograf/pull/1485): Filter out any template variable values that are empty, whitespace, or duplicates
+  1. [#1484](https://github.com/influxdata/chronograf/pull/1484): Allow user to select SingleStat as Visualization Type before adding any queries and continue to be able to click Add Query
 
 ### Features
   1. [#1477](https://github.com/influxdata/chronograf/pull/1477): Add ability to log alerts
diff --git a/ui/src/data_explorer/components/VisView.js b/ui/src/data_explorer/components/VisView.js
index 76282fac67..987ab279fc 100644
--- a/ui/src/data_explorer/components/VisView.js
+++ b/ui/src/data_explorer/components/VisView.js
@@ -43,7 +43,7 @@ const VisView = ({
   if (cellType === 'single-stat') {
     return (
       <RefreshingSingleStat
-        queries={[queries[0]]}
+        queries={queries.length ? [queries[0]] : []}
         autoRefresh={autoRefresh}
         templates={templates}
       />