diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5e8c1f7a..9ee73a675 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
   1. [#1113](https://github.com/influxdata/chronograf/issues/1113): Add Slack channel per Kapacitor alert.
   1. [#1095](https://github.com/influxdata/chronograf/pull/1095): Add new auth duration CLI option; add client heartbeat
   1. [#1168](https://github.com/influxdata/chronograf/issue/1168): Expand support for --basepath on some load balancers
+  1. [#1221](https://github.com/influxdata/chronograf/issue/1221): More sensical Cell and Dashboard defaults
 
 ### UI Improvements
   1. [#1101](https://github.com/influxdata/chronograf/pull/1101): Compress InfluxQL responses with gzip
diff --git a/ui/src/dashboards/constants/index.js b/ui/src/dashboards/constants/index.js
index 418dfaf23..8ede7d3c0 100644
--- a/ui/src/dashboards/constants/index.js
+++ b/ui/src/dashboards/constants/index.js
@@ -12,29 +12,17 @@ export const EMPTY_DASHBOARD = {
   ],
 }
 
-export const NEW_DASHBOARD = {
-  name: 'Name This Dashboard',
-  cells: [
-    {
-      x: 0,
-      y: 0,
-      w: 4,
-      h: 4,
-      name: 'Name This Graph',
-      type: 'line',
-      queries: [
-        {
-          query: "SELECT mean(\"usage_user\") AS \"usage_user\" FROM \"telegraf\".\"autogen\".\"cpu\"",
-          label: "",
-          groupbys: [],
-          wheres: [],
-        },
-      ],
-    },
-  ],
+export const NEW_DEFAULT_DASHBOARD_CELL = {
+  x: 0,
+  y: 0,
+  w: 4,
+  h: 4,
+  name: 'Name This Graph',
+  type: 'line',
+  queries: [],
 }
 
-export const NEW_DEFAULT_DASHBOARD_CELL = {
-  query: [],
-  type: 'line',
+export const NEW_DASHBOARD = {
+  name: 'Name This Dashboard',
+  cells: [NEW_DEFAULT_DASHBOARD_CELL],
 }