diff --git a/includes/discovery/os/watchguard.inc.php b/includes/discovery/os/watchguard.inc.php
index 0e0cec1f2..f3f872796 100644
--- a/includes/discovery/os/watchguard.inc.php
+++ b/includes/discovery/os/watchguard.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!$os) {
-    if (preg_match('/^WatchGuard\ Fireware/', $sysDescr)) {
+    if (preg_match('/^WatchGuard\ Fireware/', $sysDescr) || strpos($sysObjectId, '1.3.6.1.4.1.3097.1.5') !== false) {
         $os = 'firebox';
     }
 }