diff --git a/frontend/express/public/core/events/javascripts/countly.overview.models.js b/frontend/express/public/core/events/javascripts/countly.overview.models.js
index 729b9278991..7cdc35afc32 100644
--- a/frontend/express/public/core/events/javascripts/countly.overview.models.js
+++ b/frontend/express/public/core/events/javascripts/countly.overview.models.js
@@ -22,16 +22,16 @@
             eventsOverview.push(totalEvents);
             var epu = {};
             epu.name = CV.i18n("events.overview.events.per.user");
-            epu.value = ob.totalCount === 0 && ob.totalUsersCount === 0 ? 0 : Number((ob.totalCount / ob.totalUsersCount).toFixed(1));
-            var prevEpu = ob.prevTotalCount === 0 && ob.prevUsersCount === 0 ? 0 : Number((ob.prevTotalCount / ob.prevUsersCount).toFixed(1));
+            epu.value = !ob.totalUsersCount ? 0 : Number((ob.totalCount / ob.totalUsersCount).toFixed(1));
+            var prevEpu = !ob.prevUsersCount ? 0 : Number((ob.prevTotalCount / ob.prevUsersCount).toFixed(1));
             res = countlyCommon.getPercentChange(prevEpu, epu.value);
             epu.change = res.percent;
             epu.trend = res.trend;
             eventsOverview.push(epu);
             var epr = {};
             epr.name = CV.i18n("events.overview.events.per.session");
-            epr.value = ob.totalCount === 0 && ob.totalSessionCount === 0 ? 0 : Number((ob.totalCount / ob.totalSessionCount).toFixed(1));
-            var prevEpr = ob.prevTotalCount === 0 && ob.prevSessionCount === 0 ? 0 : Number((ob.prevTotalCount / ob.prevSessionCount).toFixed(1));
+            epr.value = !ob.totalSessionCount ? 0 : Number((ob.totalCount / ob.totalSessionCount).toFixed(1));
+            var prevEpr = !ob.prevSessionCount ? 0 : Number((ob.prevTotalCount / ob.prevSessionCount).toFixed(1));
             res = countlyCommon.getPercentChange(prevEpr, epr.value);
             epr.change = res.percent;
             epr.trend = res.trend;
diff --git a/frontend/express/public/javascripts/countly/countly.common.js b/frontend/express/public/javascripts/countly/countly.common.js
index 4eebd2e2178..ccc5f7f88f0 100644
--- a/frontend/express/public/javascripts/countly/countly.common.js
+++ b/frontend/express/public/javascripts/countly/countly.common.js
@@ -2417,6 +2417,9 @@
 
             var tmpNumber = "";
 
+            if (!isFinite(number)) {
+                return number + "";
+            }
             if (number >= 1000000000 || number <= -1000000000) {
                 tmpNumber = ((number / 1000000000).toFixed(1).replace(".0", "")) + "B";
             }