diff --git a/libnymea-core/nymeacore.cpp b/libnymea-core/nymeacore.cpp
index f2fc3e58..bf3be374 100644
--- a/libnymea-core/nymeacore.cpp
+++ b/libnymea-core/nymeacore.cpp
@@ -51,6 +51,8 @@
 #include "cloud/cloudnotifications.h"
 #include "cloud/cloudtransport.h"
 
+#include "zigbee/zigbeemanager.h"
+
 #include <networkmanager.h>
 
 #include <QDir>
diff --git a/libnymea-core/nymeacore.h b/libnymea-core/nymeacore.h
index 364de311..69902b68 100644
--- a/libnymea-core/nymeacore.h
+++ b/libnymea-core/nymeacore.h
@@ -46,8 +46,6 @@
 #include "time/timemanager.h"
 #include "hardwaremanagerimplementation.h"
 
-#include "zigbee/zigbeemanager.h"
-
 #include "debugserverhandler.h"
 
 #include <QObject>
diff --git a/libnymea-core/zigbee/zigbeemanager.cpp b/libnymea-core/zigbee/zigbeemanager.cpp
index f45e7225..faa8b2aa 100644
--- a/libnymea-core/zigbee/zigbeemanager.cpp
+++ b/libnymea-core/zigbee/zigbeemanager.cpp
@@ -400,8 +400,8 @@ void ZigbeeManager::addNetwork(ZigbeeNetwork *network)
         }
 
 
-        ZigbeeNodeInitializer *nodeInitializer = m_zigbeeNodeInitializers.value(network->networkUuid());
-        nodeInitializer->initializeNode(node);
+//        ZigbeeNodeInitializer *nodeInitializer = m_zigbeeNodeInitializers.value(network->networkUuid());
+//        nodeInitializer->initializeNode(node);
         //TODO: emit node added once initialized so the plugins can use it
 
         emit nodeAdded(network->networkUuid(), node);
diff --git a/libnymea-core/zigbee/zigbeenodeinitializer.cpp b/libnymea-core/zigbee/zigbeenodeinitializer.cpp
index b4c005ad..b7a5c6de 100644
--- a/libnymea-core/zigbee/zigbeenodeinitializer.cpp
+++ b/libnymea-core/zigbee/zigbeenodeinitializer.cpp
@@ -119,11 +119,12 @@ void ZigbeeNodeInitializer::initializeNode(ZigbeeNode *node)
             connect(zdoReply, &ZigbeeDeviceObjectReply::finished, this, [this, node, zdoReply](){
                 if (zdoReply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
                     qCWarning(dcZigbee()) << "Failed to bind Level cluster attributes" << zdoReply->error();
-                    emit nodeInitialized(node);
+                    //emit nodeInitialized(node);
                     return;
                 }
-                emit nodeInitialized(node);
             });
         }
     }
+
+    //emit nodeInitialized(node);
 }