diff --git a/src/app/features/dashboard/unsavedChangesSrv.js b/src/app/features/dashboard/unsavedChangesSrv.js
index f1782a35ea3..a2e419720f4 100644
--- a/src/app/features/dashboard/unsavedChangesSrv.js
+++ b/src/app/features/dashboard/unsavedChangesSrv.js
@@ -88,8 +88,11 @@ function(angular, _, config) {
       _.each(current.templating.list, function(value, index) {
         value.current = null;
         value.options = null;
-        original.templating.list[index].current = null;
-        original.templating.list[index].options = null;
+
+        if (original.templating.list.length > index) {
+          original.templating.list[index].current = null;
+          original.templating.list[index].options = null;
+        }
       });
 
       var currentTimepicker = _.findWhere(current.nav, { type: 'timepicker' });