diff --git a/includes/polling/core.inc.php b/includes/polling/core.inc.php
index 2e55d60726..80e69f3b65 100644
--- a/includes/polling/core.inc.php
+++ b/includes/polling/core.inc.php
@@ -39,13 +39,15 @@ if (empty($uptime)) {
         echo 'Using hrSystemUptime ('.$uptime."s)\n";
     } else {
         $uptime = floor($poll_device['sysUpTime'] / 100);
-        echo 'Using SNMP Agent Uptime ('.$uptime."s)\n";
+        echo 'Using SNMP Agent Uptime ('.$uptime."s)\n  ";
     }//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") {
+    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)) {