diff --git a/js/services.js b/js/services.js
index e27e255dbc5..b3409f1162b 100644
--- a/js/services.js
+++ b/js/services.js
@@ -491,7 +491,6 @@ angular.module('kibana.services', [])
         window.localStorage['dashboard'] !== ''
       ) {
         var dashboard = JSON.parse(window.localStorage['dashboard']);
-        _.defaults(dashboard,_dash);
         self.dash_load(dashboard);
       // No? Ok, grab default.json, its all we have now
       } else {
@@ -532,6 +531,9 @@ angular.module('kibana.services', [])
     // Cancel all timers
     timer.cancel_all();
 
+    // Make sure the dashboard being loaded has everything required
+    _.defaults(dashboard,_dash);
+
     // If not using time based indices, use the default index
     if(dashboard.index.interval === 'none') {
       self.indices = [dashboard.index.default];