diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 407e3cbf..f48faaaa 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -256,7 +256,9 @@ void setup() {
 	delay(1);
 
 	if(hasFs) {
-		LittleFS.gc();
+		#if defined(ESP8266)
+			LittleFS.gc();
+		#endif
 		bool flashed = false;
 		if(LittleFS.exists(FILE_FIRMWARE)) {
 			if (!config.hasConfig()) {
diff --git a/src/mqtt/HomeAssistantMqttHandler.cpp b/src/mqtt/HomeAssistantMqttHandler.cpp
index 7edd562a..401aff96 100644
--- a/src/mqtt/HomeAssistantMqttHandler.cpp
+++ b/src/mqtt/HomeAssistantMqttHandler.cpp
@@ -210,6 +210,7 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) {
         #elif defined(ESP32)
 			String haUID = WiFi.getHostname();
         #endif
+        haUID.replace("-", "_");
         String haUrl = "http://" + haUID + ".local/";
 
         for(int i=0;i<sensors;i++){