diff --git a/libnymea-core/zigbee/zigbeemanager.cpp b/libnymea-core/zigbee/zigbeemanager.cpp
index d796aa60..31267196 100644
--- a/libnymea-core/zigbee/zigbeemanager.cpp
+++ b/libnymea-core/zigbee/zigbeemanager.cpp
@@ -232,10 +232,6 @@ ZigbeeManager::ZigbeeError ZigbeeManager::setZigbeeNetworkPermitJoin(const QUuid
 
     qCDebug(dcZigbee()) << "Set permit joining in network" << network << "to" << duration << "seconds" << ZigbeeUtils::convertUint16ToHexString(shortAddress);
     network->setPermitJoining(duration, shortAddress);
-
-    // Notify all clients about the new configuration
-    emit zigbeeNetworkChanged(network);
-
     return ZigbeeManager::ZigbeeErrorNoError;
 }
 
@@ -505,6 +501,16 @@ void ZigbeeManager::addNetwork(ZigbeeNetwork *network)
         emit zigbeeNetworkChanged(network);
     });
 
+    connect(network, &ZigbeeNetwork::permitJoinDurationChanged, this, [this, network](bool permitJoinDuration){
+        qCDebug(dcZigbee()) << "Network permit join duration changed" << network->networkUuid().toString() << permitJoinDuration;
+        emit zigbeeNetworkChanged(network);
+    });
+
+    connect(network, &ZigbeeNetwork::permitJoinRemainingChanged, this, [this, network](bool permitJoinRemaining){
+        qCDebug(dcZigbee()) << "Network permit join remaining changed" << network->networkUuid().toString() << permitJoinRemaining;
+        emit zigbeeNetworkChanged(network);
+    });
+
     connect(network, &ZigbeeNetwork::nodeAdded, this, [this, network](ZigbeeNode *node){
         qCDebug(dcZigbee()) << "Node added to" << network << node;
         // The plugin don't need to see the coordinator node