diff --git a/src/app/panels/singlestat/module.js b/src/app/panels/singlestat/module.js
index 8f33ce57cae..302fe30d3f5 100644
--- a/src/app/panels/singlestat/module.js
+++ b/src/app/panels/singlestat/module.js
@@ -81,9 +81,10 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
       panelHelper.updateTimeRange($scope);
 
       return panelHelper.issueMetricQuery($scope, datasource)
-        .then($scope.dataHandler)
-        .then(null, function() {
+        .then($scope.dataHandler, function(err) {
+          $scope.series = [];
           $scope.render();
+          throw err;
         });
     };