diff --git a/ui-ngx/src/app/core/api/entity-data-subscription.ts b/ui-ngx/src/app/core/api/entity-data-subscription.ts
index 401adea879..7e3fd9ef4c 100644
--- a/ui-ngx/src/app/core/api/entity-data-subscription.ts
+++ b/ui-ngx/src/app/core/api/entity-data-subscription.ts
@@ -624,7 +624,7 @@ export class EntityDataSubscription {
   }
 
   private convertValue(val: string): any {
-    if (val && this.isNumeric(val)) {
+    if (val && this.isNumeric(val) && Number(val).toString() === val) {
       return Number(val);
     } else {
       return val;
diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index 3b26591c14..dcfb90fbbc 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -115,8 +115,7 @@ export function isEmpty(obj: any): boolean {
 }
 
 export function formatValue(value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined {
-  if (isDefined(value) &&
-    value !== null && isNumeric(value)) {
+  if (isDefinedAndNotNull(value) && isNumeric(value) && (isDefined(dec) || isDefined(units) || Number(value).toString() === value)) {
     let formatted: string | number = Number(value);
     if (isDefined(dec)) {
       formatted = formatted.toFixed(dec);