diff --git a/src/app/panels/singlestat/module.js b/src/app/panels/singlestat/module.js
index 69d758f0ee3..3264b69e06c 100644
--- a/src/app/panels/singlestat/module.js
+++ b/src/app/panels/singlestat/module.js
@@ -173,8 +173,8 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
       }
       else {
         var series = $scope.series[0];
-        data.mainValue = series.stats[$scope.panel.valueName];
-        data.mainValueFormated = $scope.getFormatedValue(data.mainValue);
+        data.mainValue = 0;
+        data.mainValueFormated = '0';
         data.flotpairs = series.flotpairs;
       }
 
diff --git a/src/app/panels/singlestat/singleStatPanel.js b/src/app/panels/singlestat/singleStatPanel.js
index f3b0d946430..01ecfe2499d 100644
--- a/src/app/panels/singlestat/singleStatPanel.js
+++ b/src/app/panels/singlestat/singleStatPanel.js
@@ -55,7 +55,7 @@ function (angular, app, _, $) {
 
         function getColorForValue(value) {
           for (var i = data.thresholds.length - 1; i >= 0 ; i--) {
-            if (value > data.thresholds[i]) {
+            if (value >= data.thresholds[i]) {
               return data.colorMap[i];
             }
           }