diff --git a/app/scripts/services/metrics.js b/app/scripts/services/metrics.js
index aa2f06b298..1e8dd519f1 100644
--- a/app/scripts/services/metrics.js
+++ b/app/scripts/services/metrics.js
@@ -25,9 +25,10 @@ angular.module("openshiftConsole")
 
       _.each(data, function(point) {
         // Set point.value to the average or null if no average.
-        if (!point.value || point.value === "NaN") {
-          var avg = point.avg;
-          point.value = (avg && avg !== "NaN") ? avg : null;
+        if (point.empty || !_.isNumber(point.avg)) {
+          point.value = null;
+        } else {
+          point.value = point.avg;
         }
       });
 
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 935903c238..39e744d21a 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -2938,10 +2938,7 @@ return k = (a || "").replace(/\/$/, "");
 }
 function g(a) {
 if (a.length) return _.each(a, function(a) {
-if (!a.value || "NaN" === a.value) {
-var b = a.avg;
-a.value = b && "NaN" !== b ? b :null;
-}
+a.empty || !_.isNumber(a.avg) ? a.value = null :a.value = a.avg;
 }), a;
 }
 function h(a) {