diff --git a/lib/ota.js b/lib/ota.js
index c247113f..43c01eea 100755
--- a/lib/ota.js
+++ b/lib/ota.js
@@ -284,7 +284,7 @@ class Ota {
         try {
             this.debug(`Checking if firmware update is available for '${devLabel(this.adapter, ieeeAddr, entity?.mapped?.model)}'`);
 
-            if (entity && entity.mapped.ota) {
+            if (entity?.mapped?.ota) {
                 const available = await entity.device.checkOta({ downgrade:false }, undefined, typeof entity.mapped.ota === 'object' ? entity.mapped.ota : {}, undefined);
                 result.status = available.available ? 'available' : 'not_available';
                 if (available.currentFileVersion !== available.otaFileVersion) {
diff --git a/lib/zigbeecontroller.js b/lib/zigbeecontroller.js
index 230d1b6e..5a476bef 100644
--- a/lib/zigbeecontroller.js
+++ b/lib/zigbeecontroller.js
@@ -993,6 +993,7 @@ class ZigbeeController extends EventEmitter {
                 this.emit('pairing', `Closed network${timestr}`, 0);
                 clearInterval(this._permitJoinInterval);
                 this._permitJoinInterval = null;
+                this._permitJoinTime = 0;
             }
         }
         catch (error) {