diff --git a/includes/discovery/sensors/current/netagent2.inc.php b/includes/discovery/sensors/current/netagent2.inc.php
index d68a5ced16..829cb7deaa 100644
--- a/includes/discovery/sensors/current/netagent2.inc.php
+++ b/includes/discovery/sensors/current/netagent2.inc.php
@@ -25,7 +25,7 @@
 
 
 if ($device['os'] == 'netagent2') {
-    $battery_current_oid = '.1.3.6.1.4.1.935.1.1.1.3.2.1.0';
+    $battery_current_oid = '.1.3.6.1.4.1.935.1.1.1.2.2.7.0';
     $battery_current = snmp_get($device, $battery_current_oid, '-Oqv');
 
     if (!empty($battery_current) || $battery_current == 0) {
diff --git a/includes/discovery/sensors/temperatures/netagent2.inc.php b/includes/discovery/sensors/temperatures/netagent2.inc.php
index 2835ac7b91..9a0d6b228c 100644
--- a/includes/discovery/sensors/temperatures/netagent2.inc.php
+++ b/includes/discovery/sensors/temperatures/netagent2.inc.php
@@ -31,8 +31,8 @@ if ($device['os'] == 'netagent2') {
     if (!empty($ups_temperature) || $ups_temperature == 0) {
         $type           = 'netagent2';
         $index          = 0;
-        $limit          = 50;
-        $warnlimit      = 40;
+        $limit          = 110;
+        $warnlimit      = 50;
         $lowlimit       = 0;
         $lowwarnlimit   = 6;
         $divisor        = 10;
diff --git a/tests/snmpsim/netagent2.snmprec b/tests/snmpsim/netagent2.snmprec
index 945246953c..9417001e16 100644
--- a/tests/snmpsim/netagent2.snmprec
+++ b/tests/snmpsim/netagent2.snmprec
@@ -1,2 +1,10 @@
 1.3.6.1.2.1.1.1.0|4|NET Agent II
 1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.935
+1.3.6.1.4.1.935.1.1.1.2.2.1.0|2|100
+1.3.6.1.4.1.935.1.1.1.2.2.7.0|2|0
+1.3.6.1.4.1.935.1.1.1.3.2.4.0|2|500
+1.3.6.1.4.1.935.1.1.1.4.2.2.0|2|500
+1.3.6.1.4.1.935.1.1.1.4.2.3.0|2|44
+1.3.6.1.4.1.935.1.1.1.2.2.3.0|2|250
+1.3.6.1.4.1.935.1.1.1.3.2.1.0|2|2545
+1.3.6.1.4.1.935.1.1.1.4.2.1.0|2|2285
\ No newline at end of file