diff --git a/html/includes/table/sensors-common.php b/html/includes/table/sensors-common.php
index 39adafe164..5d566e599d 100644
--- a/html/includes/table/sensors-common.php
+++ b/html/includes/table/sensors-common.php
@@ -121,7 +121,7 @@ foreach (dbFetchRows($sql, $param) as $sensor) {
     } else {
         // we have another sensor
         $current_label = get_sensor_label_color($sensor);
-        $sensor_current = "<span class='label $current_label'>".(format_si($sensor['sensor_current'])+0)." $unit</span>";
+        $sensor_current = "<span class='label $current_label'>".format_si($sensor['sensor_current']).$unit."</span>";
     }
 
     $response[] = array(
diff --git a/html/pages/device/health/sensors.inc.php b/html/pages/device/health/sensors.inc.php
index 2f136701e4..49569ae8a2 100644
--- a/html/pages/device/health/sensors.inc.php
+++ b/html/pages/device/health/sensors.inc.php
@@ -23,13 +23,13 @@ foreach (dbFetchRows('SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `devi
         $sensor_current = get_state_label($sensor['state_generic_value'], $state_translation[0]['state_descr'] . " (".$sensor['sensor_current'].")");
     } else {
         $current_label = get_sensor_label_color($sensor);
-        $sensor_current = "<span class='label $current_label'>".(format_si($sensor['sensor_current'])+0)." $unit</span>";
+        $sensor_current = "<span class='label $current_label'>".format_si($sensor['sensor_current']).$unit."</span>";
     }
 
-    $sensor_limit = (format_si($sensor['sensor_limit'])+0)." $unit";
-    $sensor_limit_low = (format_si($sensor['sensor_limit_low'])+0)." $unit";
-    $sensor_limit_warn = (format_si($sensor['sensor_limit_warn'])+0)." $unit";
-    $sensor_limit_low_warn = (format_si($sensor['sensor_limit_low_warn'])+0)." $unit";
+    $sensor_limit = format_si($sensor['sensor_limit']).$unit;
+    $sensor_limit_low = format_si($sensor['sensor_limit_low']).$unit;
+    $sensor_limit_warn = format_si($sensor['sensor_limit_warn']).$unit;
+    $sensor_limit_low_warn = format_si($sensor['sensor_limit_low_warn']).$unit;
 
     echo "<div class='panel panel-default'>
         <div class='panel-heading'>
diff --git a/includes/common.php b/includes/common.php
index c8fd02eb25..c527378e42 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -627,7 +627,7 @@ function format_si($value, $round = '2', $sf = '3')
         $value = $value * -1;
     }
 
-    return number_format(round($value, $round), $sf, '.', '').$ext;
+    return (number_format(round($value, $round), $sf, '.', '')+0)." ".$ext;
 }
 
 function format_bi($value, $round = '2', $sf = '3')
@@ -646,8 +646,7 @@ function format_bi($value, $round = '2', $sf = '3')
     if ($neg) {
         $value = $value * -1;
     }
-
-    return number_format(round($value, $round), $sf, '.', '').$ext;
+    return (number_format(round($value, $round), $sf, '.', '')+0)." ".$ext;
 }
 
 function format_number($value, $base = '1000', $round = 2, $sf = 3)