diff --git a/src/app/panels/singlestat/singleStatPanel.js b/src/app/panels/singlestat/singleStatPanel.js
index 90a718ca118..2c9f8b2613b 100644
--- a/src/app/panels/singlestat/singleStatPanel.js
+++ b/src/app/panels/singlestat/singleStatPanel.js
@@ -138,6 +138,8 @@ function (angular, app, _, $) {
         }
 
         function render() {
+          if (!scope.data) { return; }
+
           data = scope.data;
           panel = scope.panel;
 
diff --git a/src/app/services/dashboard/dashboardViewStateSrv.js b/src/app/services/dashboard/dashboardViewStateSrv.js
index 772e47f8c96..c08d3cdba6b 100644
--- a/src/app/services/dashboard/dashboardViewStateSrv.js
+++ b/src/app/services/dashboard/dashboardViewStateSrv.js
@@ -69,7 +69,8 @@ function (angular, _, $) {
 
       if (!this.state.fullscreen) {
         this.state.panelId = null;
-        this.state.edit = false;
+        this.state.fullscreen = null;
+        this.state.edit = null;
       }
 
       if (!skipUrlSync) {
diff --git a/src/test/specs/dashboardViewStateSrv-specs.js b/src/test/specs/dashboardViewStateSrv-specs.js
index 82ccfe51363..1ade349610d 100644
--- a/src/test/specs/dashboardViewStateSrv-specs.js
+++ b/src/test/specs/dashboardViewStateSrv-specs.js
@@ -30,7 +30,7 @@ define([
         viewState.update({fullscreen: false});
         expect(location.search()).to.eql({});
         expect(viewState.fullscreen).to.be(false);
-        expect(viewState.state.fullscreen).to.be(false);
+        expect(viewState.state.fullscreen).to.be(null);
       });
     });