diff --git a/src/HomeAssistantDiscovery.cpp b/src/HomeAssistantDiscovery.cpp
index 11d6a49..cf48c75 100644
--- a/src/HomeAssistantDiscovery.cpp
+++ b/src/HomeAssistantDiscovery.cpp
@@ -608,7 +608,7 @@ void HomeAssistantDiscovery::publishHASSDeviceConfig(char* deviceType, const cha
                      "",
     { { (char*)"en", (char*)"true" } });
 
-    if(_offEnabled)
+    if(_offEnabled && strcmp(deviceType, "SmartLock") == 0)
     {
         // Hybrid connected
         String hybridPath = _baseTopic;
diff --git a/src/NukiNetwork.cpp b/src/NukiNetwork.cpp
index 9c4e493..87e196b 100644
--- a/src/NukiNetwork.cpp
+++ b/src/NukiNetwork.cpp
@@ -723,8 +723,11 @@ bool NukiNetwork::reconnect()
                         removeTopic(_maintenancePathPrefix, topic);
                         removeTopic(mqttLockPath, topic);
                         removeTopic(mqttOpenerPath, topic);
-                        removeTopic(mqttOldOpenerPath, topic);
-                        removeTopic(mqttOldOpenerPath2, topic);
+                        if (len > 5)
+                        {
+                            removeTopic(mqttOldOpenerPath, topic);
+                            removeTopic(mqttOldOpenerPath2, topic);
+                        }
                     }
 
                     _preferences->putBool(preference_reset_mqtt_topics, false);