diff --git a/includes/discovery/os/ubiquitiap.inc.php b/includes/discovery/os/ubiquitiap.inc.php
index 243fec9756..3bc75d29b4 100644
--- a/includes/discovery/os/ubiquitiap.inc.php
+++ b/includes/discovery/os/ubiquitiap.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!$os) {
-    if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") ) {
+    if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") || stristr(snmp_get($device, "dot11manufacturerName.6", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks")) {
         $os = "ubiquitiap";
     }
 }
diff --git a/includes/polling/os/ubiquitiap.inc.php b/includes/polling/os/ubiquitiap.inc.php
index 63884caeb4..545862f728 100644
--- a/includes/polling/os/ubiquitiap.inc.php
+++ b/includes/polling/os/ubiquitiap.inc.php
@@ -1,6 +1,9 @@
 <?php
 
 $data = snmp_get_multi($device, "dot11manufacturerProductName.5 dot11manufacturerProductVersion.5", "-Oqv", "IEEE802dot11-MIB");
+if (empty($data)) {
+    $data = snmp_get_multi($device, "dot11manufacturerProductName.6 dot11manufacturerProductVersion.6", "-Oqv", "IEEE802dot11-MIB");
+}
 $hardware = $data[0];
 
 if (preg_match("/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $data[1],$matches)) {