diff --git a/public/app/panels/graph/graph.js b/public/app/panels/graph/graph.js
index 5e8bcb2d964..3749807e2ee 100755
--- a/public/app/panels/graph/graph.js
+++ b/public/app/panels/graph/graph.js
@@ -115,7 +115,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
             var formater = kbn.valueFormats[scope.panel.y_formats[series.yaxis - 1]];
 
             // decimal override
-            if (scope.panel.decimals) {
+            if (_.isNumber(scope.panel.decimals)) {
               series.updateLegendValues(formater, scope.panel.decimals, null);
             } else {
               // auto decimals
diff --git a/public/app/panels/singlestat/module.js b/public/app/panels/singlestat/module.js
index 302fe30d3f5..a43ac2d0b69 100644
--- a/public/app/panels/singlestat/module.js
+++ b/public/app/panels/singlestat/module.js
@@ -129,7 +129,7 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
     };
 
     $scope.getDecimalsForValue = function(value) {
-      if ($scope.panel.decimals) {
+      if (_.isNumber($scope.panel.decimals)) {
         return { decimals: $scope.panel.decimals, scaledDecimals: null };
       }