diff --git a/includes/discovery/os/comware.inc.php b/includes/discovery/os/comware.inc.php
index 906e9c5078..5bac4f730b 100644
--- a/includes/discovery/os/comware.inc.php
+++ b/includes/discovery/os/comware.inc.php
@@ -4,7 +4,10 @@ if (!$os) {
     if (strstr($sysDescr, 'Comware')) {
         $os = 'comware';
     }
-    else if (preg_match('/HP [a-zA-Z0-9- ]+ Switch Software Version/', $sysDescr)) {
+    elseif (preg_match('/HP [a-zA-Z0-9- ]+ Switch Software Version/', $sysDescr)) {
+        $os = 'comware';
+    }
+    elseif (strstr($sysObjectId, '.1.3.6.1.4.1.25506.11.1')) {
         $os = 'comware';
     }
 }