diff --git a/app/Models/Device.php b/app/Models/Device.php
index 2ceb1ea404..270e11aa51 100644
--- a/app/Models/Device.php
+++ b/app/Models/Device.php
@@ -227,9 +227,10 @@ class Device extends BaseModel
         } else {
             // load from yaml
             if ($existing) {
-                $os_list = array_map(function ($os) use ($install_dir) {
-                    return $install_dir . '/includes/definitions/' . $os . '.yaml';
-                }, self::distinct('os')->get('os')->toArray());
+                $os_list = [];
+                foreach (self::distinct('os')->get('os')->toArray() as $os) {
+                    $os_list[] = $install_dir . '/includes/definitions/' . $os['os'] . '.yaml';
+                }
             } else {
                 $os_list = glob($install_dir . '/includes/definitions/*.yaml');
             }
diff --git a/includes/definitions/cdata.yaml b/includes/definitions/cdata.yaml
index 15ee9334fe..ccc2f537ae 100644
--- a/includes/definitions/cdata.yaml
+++ b/includes/definitions/cdata.yaml
@@ -10,5 +10,8 @@ over:
     - { graph: device_processor, text: 'CPU Usage' }
     - { graph: device_mempool, text: 'Memory Usage' }
 discovery:
-    - sysObjectID:
-        - .1.3.6.1.4.1.17409
+    - 
+        sysObjectID:
+            - .1.3.6.1.4.1.17409
+        sysObjectID_except:
+            - .1.3.6.1.4.1.17409.1