diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2d97d48f0..c00eec50b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,15 @@
 ## v1.5.0.0 [unreleased]
 
 ### Features
+
 1.  [#2526](https://github.com/influxdata/chronograf/pull/2526): Add support for RS256/JWKS verification, support for id_token parsing (as in ADFS)
 
 ### UI Improvements
+
 ### Bug Fixes
 
+1.  [#2950](https://github.com/influxdata/chronograf/pull/2094): Always save template variables on first edit
+
 ## v1.4.3.0 [unreleased]
 
 ### UI Improvements
diff --git a/ui/src/dashboards/actions/index.js b/ui/src/dashboards/actions/index.js
index 6a6d904a43..94477b2ad0 100644
--- a/ui/src/dashboards/actions/index.js
+++ b/ui/src/dashboards/actions/index.js
@@ -201,10 +201,13 @@ export const getDashboardsAsync = () => async dispatch => {
 
 const removeUnselectedTemplateValues = dashboard => {
   const templates = dashboard.templates.map(template => {
-    const values =
-      template.type === 'csv'
-        ? template.values
-        : [template.values.find(val => val.selected)] || []
+    if (template.type === 'csv') {
+      return template
+    }
+
+    const value = template.values.find(val => val.selected)
+    const values = value ? [value] : []
+
     return {...template, values}
   })
   return templates