diff --git a/client/src/containers/ConsumerGroup/ConsumerGroupDetail/ConsumerGroupTopics/ConsumerGroupTopics.jsx b/client/src/containers/ConsumerGroup/ConsumerGroupDetail/ConsumerGroupTopics/ConsumerGroupTopics.jsx
index a581c0ae6..b68b20749 100644
--- a/client/src/containers/ConsumerGroup/ConsumerGroupDetail/ConsumerGroupTopics/ConsumerGroupTopics.jsx
+++ b/client/src/containers/ConsumerGroup/ConsumerGroupDetail/ConsumerGroupTopics/ConsumerGroupTopics.jsx
@@ -39,7 +39,7 @@ class ConsumerGroupTopics extends Root {
   }
 
   handleOptional(optional) {
-    if (optional !== undefined && optional !== '') {
+    if (optional !== undefined && optional !== '' && optional !== 'NaN') {
       return <label>{optional}</label>;
     } else {
       return <label>-</label>;
@@ -115,7 +115,7 @@ class ConsumerGroupTopics extends Root {
               colName: 'Lag',
               type: 'text',
               cell: obj => {
-                return this.handleOptional(obj.lag);
+                return this.handleOptional(Number(obj.lag).toLocaleString());
               }
             }
           ]}
diff --git a/client/src/containers/ConsumerGroup/ConsumerGroupList/ConsumerGroupList.jsx b/client/src/containers/ConsumerGroup/ConsumerGroupList/ConsumerGroupList.jsx
index 25825f00a..c6bc369ae 100644
--- a/client/src/containers/ConsumerGroup/ConsumerGroupList/ConsumerGroupList.jsx
+++ b/client/src/containers/ConsumerGroup/ConsumerGroupList/ConsumerGroupList.jsx
@@ -127,7 +127,7 @@ class ConsumerGroupList extends Root {
         >
           {topicId + ' '}
 
-          <div className="badge badge-secondary">Lag: {offsetLag}</div>
+          <div className="badge badge-secondary">Lag: {Number(offsetLag).toLocaleString()}</div>
         </Link>
       );
     });
diff --git a/client/src/containers/Node/NodeDetail/NodeLogs/NodeLogs.jsx b/client/src/containers/Node/NodeDetail/NodeLogs/NodeLogs.jsx
index dc05bf08c..836fa04cd 100644
--- a/client/src/containers/Node/NodeDetail/NodeLogs/NodeLogs.jsx
+++ b/client/src/containers/Node/NodeDetail/NodeLogs/NodeLogs.jsx
@@ -36,7 +36,7 @@ class NodeLogs extends Root {
         topic: log.topic,
         partition: log.partition,
         size: showBytes(log.size),
-        offsetLag: log.offsetLag
+        offsetLag: Number(log.offsetLag).toLocaleString()
       };
     });
     this.setState({ data: tableNodes, loading: false });
diff --git a/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx b/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
index 0d55c3026..aabbe6dee 100644
--- a/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
+++ b/client/src/containers/Topic/Topic/TopicGroups/TopicGroups.jsx
@@ -76,7 +76,7 @@ class TopicGroups extends Root {
           onClick={noPropagation}
         >
           {topic}
-          <div className="badge badge-secondary">Lag: {topics[topic]}</div>
+          <div className="badge badge-secondary">Lag: {Number(topics[topic]).toLocaleString()}</div>
         </Link>
       );
     });
diff --git a/client/src/containers/Topic/Topic/TopicLogs/TopicLogs.jsx b/client/src/containers/Topic/Topic/TopicLogs/TopicLogs.jsx
index 60118ef95..d5dc5b8c4 100644
--- a/client/src/containers/Topic/Topic/TopicLogs/TopicLogs.jsx
+++ b/client/src/containers/Topic/Topic/TopicLogs/TopicLogs.jsx
@@ -30,7 +30,7 @@ class TopicLogs extends Root {
         topic: log.topic,
         partition: log.partition,
         size: log.size,
-        offsetLag: log.offsetLag
+        offsetLag: Number(log.offsetLag).toLocaleString()
       };
     });
     this.setState({ data: tableLogs, loading: false });
diff --git a/client/src/containers/Topic/TopicList/TopicList.jsx b/client/src/containers/Topic/TopicList/TopicList.jsx
index 497a5c7fc..6bde056a1 100644
--- a/client/src/containers/Topic/TopicList/TopicList.jsx
+++ b/client/src/containers/Topic/TopicList/TopicList.jsx
@@ -243,7 +243,7 @@ class TopicList extends Root {
               className={className}
               onClick={noPropagation}
             >
-              {consumerGroup.id} <div className="badge badge-secondary"> Lag: {offsetLag}</div>
+              {consumerGroup.id} <div className="badge badge-secondary"> Lag: {Number(offsetLag).toLocaleString()}</div>
             </Link>
           );
       });