diff --git a/lib/extension/bridge.js b/lib/extension/bridge.js
index b985b515e..22953a470 100644
--- a/lib/extension/bridge.js
+++ b/lib/extension/bridge.js
@@ -20,6 +20,7 @@ class Bridge extends Extension {
         this.restartRequired = false;
 
         this.permitJoinChanged = this.permitJoinChanged.bind(this);
+        this.eventBus.on('permitJoinChanged', this.permitJoinChanged, this.constructor.name);
 
         this.requestLookup = {
             'device/options': this.deviceOptions.bind(this),
@@ -63,8 +64,6 @@ class Bridge extends Extension {
         await this.publishInfo();
         await this.publishDevices();
         await this.publishGroups();
-
-        this.eventBus.on('permitJoinChanged', this.permitJoinChanged, this.constructor.name);
     }
 
     setupMQTTLogging() {
@@ -81,7 +80,7 @@ class Bridge extends Extension {
     }
 
     permitJoinChanged(data) {
-        if (!this.zigbee.isStopping()) {
+        if (!this.zigbee.isStopping() && this.zigbee2mqttVersion) {
             this.publishInfo();
         }
     }