diff --git a/Config.h b/Config.h
index 1d9c2b4..1f4b8e1 100644
--- a/Config.h
+++ b/Config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define NUKI_HUB_VERSION "8.8-pre-2"
+#define NUKI_HUB_VERSION "8.8-pre-3"
 
 #define MQTT_QOS_LEVEL 1
 #define MQTT_CLEAN_SESSIONS false
\ No newline at end of file
diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index 4b425c6..1be8d7e 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -162,7 +162,7 @@ void NukiOpenerWrapper::update()
     {
         _nextConfigUpdateTs = ts + _intervalConfig * 1000;
         updateConfig();
-        if(_hassEnabled)
+        if(_hassEnabled && !_hassSetupCompleted)
         {
             setupHASS();
         }
@@ -619,7 +619,7 @@ void NukiOpenerWrapper::readAdvancedConfig()
 
 void NukiOpenerWrapper::setupHASS()
 {
-    if(!_nukiConfigValid || _hassSetupCompleted) return;
+    if(!_nukiConfigValid) return;
 
     String baseTopic = _preferences->getString(preference_mqtt_opener_path);
     char uidString[20];
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 4109298..5b04191 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -163,7 +163,7 @@ void NukiWrapper::update()
     {
         _nextConfigUpdateTs = ts + _intervalConfig * 1000;
         updateConfig();
-        if(_hassEnabled)
+        if(_hassEnabled && !_hassSetupCompleted)
         {
             setupHASS();
         }
@@ -642,7 +642,7 @@ void NukiWrapper::readAdvancedConfig()
 
 void NukiWrapper::setupHASS()
 {
-    if(!_nukiConfigValid || _hassSetupCompleted) return;
+    if(!_nukiConfigValid) return;
 
     String baseTopic = _preferences->getString(preference_mqtt_lock_path);
     char uidString[20];