diff --git a/public/app/features/dashboard/viewStateSrv.js b/public/app/features/dashboard/viewStateSrv.js
index 6cf3afc5463..d1dee7a2d5f 100644
--- a/public/app/features/dashboard/viewStateSrv.js
+++ b/public/app/features/dashboard/viewStateSrv.js
@@ -155,11 +155,10 @@ function (angular, _, $) {
       if (!render) { return false;}
 
       $timeout(function() {
-        if (self.oldTimeRange !== ctrl.range) {
+        if (self.oldTimeRange && self.oldTimeRange !== ctrl.range) {
           self.$scope.broadcastRefresh();
-        }
-        else {
-          ctrl.render();
+        } else {
+          self.$scope.$broadcast('render');
         }
         delete self.fullscreenPanel;
       });