diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js
index e8216165486..ff53eb93f70 100644
--- a/public/app/features/dashboard/dashboardSrv.js
+++ b/public/app/features/dashboard/dashboardSrv.js
@@ -403,11 +403,10 @@ function (angular, $, _, moment) {
 
       if (oldVersion < 11) {
         // update template variables
-        for (i = 0 ; i < this.templating.list.length; i++) {
-          var templateVariable = this.templating.list[i];
+        _.each(this.templating.list, function(templateVariable) {
           if (templateVariable.refresh) { templateVariable.refresh = 'On Dashboard Load'; }
           if (!templateVariable.refresh) { templateVariable.refresh = 'Never'; }
-        }
+        });
       }
 
       if (panelUpgrades.length === 0) {
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index 4e5530b82f7..e5861ad12c1 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -21,13 +21,13 @@ function (angular, _, kbn) {
     }, $rootScope);
 
     $rootScope.onAppEvent('refresh', function() {
-      var promises = [];
-      for (var i = 0; i < self.variables.length; i++) {
-        var variable = self.variables[i];
-        if (variable.refresh === 'On Time Change and Dashboard Load') {
-          promises.push(self.updateOptions(variable));
-        }
-      }
+      var promises = _.chain(self.variables)
+      .filter(function(variable) {
+        return variable.refresh === 'On Time Change and Dashboard Load';
+      })
+      .map(function(variable) {
+        return self.updateOptions(variable);
+      }).value();
       return $q.all(promises);
     }, $rootScope);