diff --git a/discovery.php b/discovery.php
index de4222ceea..28c90d0ba4 100755
--- a/discovery.php
+++ b/discovery.php
@@ -112,7 +112,7 @@ if (! empty(\LibreNMS\Config::get('distributed_poller_group'))) {
 }
 
 global $device;
-foreach (dbFetch("SELECT * FROM `devices` WHERE disabled = 0 AND snmp_disable = 0 $where ORDER BY device_id DESC", $sqlparams) as $device) {
+foreach (dbFetch("SELECT * FROM `devices` WHERE disabled = 0 $where ORDER BY device_id DESC", $sqlparams) as $device) {
     DeviceCache::setPrimary($device['device_id']);
     $discovered_devices += (int) discover_device($device, $module_override);
 }
diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index b47f23d35c..7690236103 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -123,7 +123,7 @@ function load_discovery(&$device)
 function discover_device(&$device, $force_module = false)
 {
     if ($device['snmp_disable'] == '1') {
-        return false;
+        return true;
     }
 
     global $valid;