diff --git a/lib/AmsConfiguration/src/AmsConfiguration.cpp b/lib/AmsConfiguration/src/AmsConfiguration.cpp
index 40ebb226..8e4b793c 100644
--- a/lib/AmsConfiguration/src/AmsConfiguration.cpp
+++ b/lib/AmsConfiguration/src/AmsConfiguration.cpp
@@ -337,6 +337,9 @@ bool AmsConfiguration::getHomeAssistantConfig(HomeAssistantConfig& config) {
 		EEPROM.begin(EEPROM_SIZE);
 		EEPROM.get(CONFIG_HA_START, config);
 		EEPROM.end();
+		if(stripNonAscii((uint8_t*) config.discoveryPrefix, 64) || stripNonAscii((uint8_t*) config.discoveryHostname, 64) || stripNonAscii((uint8_t*) config.discoveryNameTag, 16)) {
+			clearHomeAssistantConfig(config);
+		}
 		return true;
 	} else {
 		clearHomeAssistantConfig(config);
diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp
index 549dedb8..c23e3fda 100644
--- a/lib/SvelteUi/src/AmsWebServer.cpp
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -805,19 +805,11 @@ void AmsWebServer::configurationJson() {
 	DebugConfig debugConfig;
 	config->getDebugConfig(debugConfig);
 	DomoticzConfig domo;
-	if(mqttConfig.payloadFormat == 3) {
-		config->getDomoticzConfig(domo);
-	} else {
-		config->clearDomo(domo);
-	}
+	config->getDomoticzConfig(domo);
 	UiConfig ui;
 	config->getUiConfig(ui);
 	HomeAssistantConfig haconf;
-	if(mqttConfig.payloadFormat == 4) {
-		config->getHomeAssistantConfig(haconf);
-	} else {
-		config->clearHomeAssistantConfig(haconf);
-	}
+	config->getHomeAssistantConfig(haconf);
 
 	bool qsc = false;
 	bool qsr = false;