diff --git a/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h b/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
index f30c4ca7..4a037867 100644
--- a/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
+++ b/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
@@ -10,6 +10,7 @@
 #include "AmsMqttHandler.h"
 #include "HomeAssistantStatic.h"
 #include "AmsConfiguration.h"
+#include "hexutils.h"
 
 class HomeAssistantMqttHandler : public AmsMqttHandler {
 public:
@@ -32,13 +33,15 @@ public:
         deviceModel = boardTypeToString(boardType);
         manufacturer = boardManufacturerToString(boardType);
 
+        char hostname[32];
         #if defined(ESP8266)
-            String hostname = WiFi.hostname();
+            strcpy(hostname, WiFi.hostname());
         #elif defined(ESP32)
-            String hostname = WiFi.getHostname();
+            strcpy(hostname, WiFi.getHostname());
         #endif
 
-        deviceUid = hostname; // Maybe configurable in the future?
+        stripNonAscii((uint8_t*) hostname, 32, false);
+        deviceUid = String(hostname); // Maybe configurable in the future?
 
         if(strlen(config.discoveryHostname) > 0) {
             if(strncmp_P(config.discoveryHostname, PSTR("http"), 4) == 0) {
diff --git a/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h b/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
index 6bf6b7c8..e4b5d7ad 100644
--- a/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
+++ b/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
@@ -80,8 +80,8 @@ const HomeAssistantSensor List4ExportSensors[List4ExportSensorCount] PROGMEM = {
 
 const uint8_t RealtimeSensorCount PROGMEM = 8;
 const HomeAssistantSensor RealtimeSensors[RealtimeSensorCount] PROGMEM = {
-    {"Month max",                  "/realtime","max",                120, "kWh",  "energy",          "measurement"},
-    {"Tariff threshold",           "/realtime","threshold",          120, "kWh",  "energy",          "measurement"},
+    {"Month max",                  "/realtime","max",                120, "kWh",  "energy",          ""},
+    {"Tariff threshold",           "/realtime","threshold",          120, "kWh",  "energy",          ""},
     {"Current hour used",          "/realtime","hour.use",           120, "kWh",  "energy",          "total_increasing"},
     {"Current hour cost",          "/realtime","hour.cost",          120, "",     "monetary",        ""},
     {"Current day used",           "/realtime","day.use",            120, "kWh",  "energy",          "total_increasing"},