diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php
index ef4288e7c..c93660b6f 100644
--- a/html/pages/device/overview/generic/sensor.inc.php
+++ b/html/pages/device/overview/generic/sensor.inc.php
@@ -12,7 +12,7 @@ if (count($sensors)) {
     echo '      </div>
         <table class="table table-hover table-condensed table-striped">';
     foreach ($sensors as $sensor) {
-        if (empty($sensor['sensor_current'])) {
+        if (!isset($sensor['sensor_current'])) {
             $sensor['sensor_current'] = 'NaN';
         }
 
diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
index d1fcf196e..fdd9aa3d7 100644
--- a/includes/polling/functions.inc.php
+++ b/includes/polling/functions.inc.php
@@ -83,7 +83,7 @@ function poll_sensor($device, $class, $unit) {
             $sensor_value = 0;
         }
 
-        if ($sensor['sensor_divisor']) {
+        if ($sensor['sensor_divisor'] && $sensor_value !== 0) {
             $sensor_value = ($sensor_value / $sensor['sensor_divisor']);
         }