diff --git a/src/views/app.js b/src/views/app.js
index 8b79008cb..48ba58154 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -791,7 +791,10 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                     }
                 };
 
-                if (format) options.scales.y.ticks.callback = function (value) { return (formatDivisor ? (value/formatDivisor) : value).toFixed(2) + ' ' + format; };
+                if (format) options.scales.y.ticks.callback = function (value) {
+                    if (!formatDivisor) return value + ' ' + format;
+                    return (value/formatDivisor).toLocaleString('en-US', { maximumFractionDigits: 6 }) + ' ' + format;
+                };
                 if (max) options.scales.y.max = max;
                 if (stepSize) options.scales.y.ticks.stepSize = stepSize;