diff --git a/includes/polling/core.inc.php b/includes/polling/core.inc.php
index 2e55d60726..c228cc447f 100644
--- a/includes/polling/core.inc.php
+++ b/includes/polling/core.inc.php
@@ -43,9 +43,11 @@ if (empty($uptime)) {
     }//end if
 }//end if
 
-if ($snmp_uptime > $uptime && is_numeric($snmp_uptime)) {
-    $uptime = $snmp_uptime;
-    d_echo('hrSystemUptime or sysUpTime looks like to have rolled, using snmpEngineTime instead');
+if ($device["os"] != "edgeswitch" || $device["os"] != "edgeos") {
+    if ($snmp_uptime > $uptime && is_numeric($snmp_uptime)) {
+        $uptime = $snmp_uptime;
+        d_echo('hrSystemUptime or sysUpTime looks like to have rolled, using snmpEngineTime instead');
+    }
 }
 
 if (is_numeric($uptime)) {