diff --git a/core/class/AbeilleParser.class.php b/core/class/AbeilleParser.class.php
index bd7bc297c..b2333f46d 100755
--- a/core/class/AbeilleParser.class.php
+++ b/core/class/AbeilleParser.class.php
@@ -326,7 +326,7 @@ function findModel(&$eq, $by='modelId') {
             $modelSource = "Abeille"; // Default location
 
             if (isset($eq['zigbee']['modelId']) && ($eq['zigbee']['modelId'] !== false) && ($eq['zigbee']['modelId'] != '')) {
-                if (($eq['zigbee']['manufId'] !== false) && ($eq['zigbee']['manufId'] != '')) {
+                if (isset($eq['zigbee']['manufId']) && ($eq['zigbee']['manufId'] !== false) && ($eq['zigbee']['manufId'] != '')) {
                     /* Search by modelId AND manufacturer */
                     $identifier = $eq['zigbee']['modelId'].'_'.$eq['zigbee']['manufId'];
                      if (isset($GLOBALS['customEqList'][$identifier])) {
@@ -887,10 +887,9 @@ function deviceConfigure($net, $addr) {
                 'net' => $net,
                 'addr' => $addr,
                 'ieee' => $eq['zigbee']['ieee'],
-                // 'ep' => $eq['epFirst'],
                 'ep' => $eq['mainEp'],
                 'modelId' => $eq['zigbee']['modelId'],
-                'manufId' => $eq['zigbee']['manufId'],
+                'manufId' => isset($eq['zigbee']['manufId']) ? $eq['zigbee']['manufId'] : '',
                 'modelName' => $eq['eqModel']['modelName'],
                 'modelSource' => $eq['eqModel']['modelSource'], // "Abeille" or "local"
                 'macCapa' => $eq['zigbee']['macCapa'],
diff --git a/resources/fw_zigate/zigatev1-AB01-0000-opdm-dev.bin b/resources/fw_zigate/zigatev1-AB01-0000-opdm-dev.bin
index 4fb792d7b..ee8597b5c 100644
Binary files a/resources/fw_zigate/zigatev1-AB01-0000-opdm-dev.bin and b/resources/fw_zigate/zigatev1-AB01-0000-opdm-dev.bin differ