diff --git a/src/mqtt/hasp_mqtt.h b/src/mqtt/hasp_mqtt.h
index 6d3dcbde..322c7b88 100644
--- a/src/mqtt/hasp_mqtt.h
+++ b/src/mqtt/hasp_mqtt.h
@@ -8,7 +8,9 @@
 
 #include "hasp_conf.h"
 
-#define __FlashStringHelper char
+#ifdef WINDOWS
+    #define __FlashStringHelper char
+#endif
 
 void mqttSetup();
 void mqttLoop();
@@ -26,6 +28,8 @@ bool mqttGetConfig(const JsonObject & settings);
 bool mqttSetConfig(const JsonObject & settings);
 #endif
 
-//String mqttGetNodename(void);
+#ifndef WINDOWS
+String mqttGetNodename(void);
+#endif
 
 #endif
\ No newline at end of file
diff --git a/src/mqtt/hasp_mqtt_ha.cpp b/src/mqtt/hasp_mqtt_ha.cpp
index a5e1bfe7..1bab42f0 100644
--- a/src/mqtt/hasp_mqtt_ha.cpp
+++ b/src/mqtt/hasp_mqtt_ha.cpp
@@ -4,19 +4,20 @@
 #include "ArduinoJson.h"
 #include "hasp_conf.h"
 
-#if 0 && HASP_USE_MQTT > 0
+#ifndef WINDOWS
+    #if HASP_USE_MQTT > 0
 
-    #include "PubSubClient.h"
+        #include "PubSubClient.h"
 
-    #include "hasp/hasp.h"
-    #include "hasp/hasp_dispatch.h"
-    #include "hasp_hal.h"
-    #include "hasp_mqtt.h"
-    #include "hasp_mqtt_ha.h"
+        #include "hasp/hasp.h"
+        #include "hasp/hasp_dispatch.h"
+        #include "hal/hasp_hal.h"
+        #include "hasp_mqtt.h"
+        #include "hasp_mqtt_ha.h"
 
-    #define RETAINED true
-    #define HASP_MAC_ADDRESS halGetMacAddress(0, "").c_str()
-    #define HASP_MAC_ADDRESS_STR halGetMacAddress(0, "")
+        #define RETAINED true
+        #define HASP_MAC_ADDRESS halGetMacAddress(0, "").c_str()
+        #define HASP_MAC_ADDRESS_STR halGetMacAddress(0, "")
 
 extern PubSubClient mqttClient;
 extern char mqttNodeName[16];
@@ -27,10 +28,10 @@ extern bool mqttHAautodiscover;
 
 char discovery_prefix[] = "homeassistant";
 
-const char FP_MQTT_HA_DEVICE[] PROGMEM = "device";
-const char FP_MQTT_HA_IDENTIFIERS[] PROGMEM = "ids";
-const char FP_MQTT_HA_NAME[] PROGMEM = "name";
-const char FP_MQTT_HA_MODEL[] PROGMEM = "mdl";
+const char FP_MQTT_HA_DEVICE[] PROGMEM       = "device";
+const char FP_MQTT_HA_IDENTIFIERS[] PROGMEM  = "ids";
+const char FP_MQTT_HA_NAME[] PROGMEM         = "name";
+const char FP_MQTT_HA_MODEL[] PROGMEM        = "mdl";
 const char FP_MQTT_HA_MANUFACTURER[] PROGMEM = "mf";
 
 void mqtt_ha_send_json(char * topic, JsonDocument & doc)
@@ -53,9 +54,9 @@ void mqtt_ha_add_device_ids(JsonDocument & doc)
     haspGetVersion(buffer, sizeof(buffer));
     device[F("sw")] = buffer;
 
-    device[FPSTR(FP_MQTT_HA_NAME)] = mqttNodeName;
-    device[FPSTR(FP_MQTT_HA_MODEL)]  = F(PIOENV);
-    device[FPSTR(FP_MQTT_HA_MANUFACTURER)]   = F(D_MANUFACTURER);
+    device[FPSTR(FP_MQTT_HA_NAME)]         = mqttNodeName;
+    device[FPSTR(FP_MQTT_HA_MODEL)]        = F(PIOENV);
+    device[FPSTR(FP_MQTT_HA_MANUFACTURER)] = F(D_MANUFACTURER);
 
     doc[F("~")] = mqttNodeTopic;
 }
@@ -251,6 +252,7 @@ void mqtt_ha_register_auto_discovery()
     mqtt_ha_register_idle();
     mqtt_ha_register_connectivity();
 }
+    #endif
 #endif
 
 /*
diff --git a/src/mqtt/hasp_mqtt_paho.cpp b/src/mqtt/hasp_mqtt_paho.cpp
index 07ebb2b5..a0c017f8 100644
--- a/src/mqtt/hasp_mqtt_paho.cpp
+++ b/src/mqtt/hasp_mqtt_paho.cpp
@@ -109,20 +109,11 @@ static bool mqttPublish(const char * topic, const char * payload, size_t len, bo
 
 void connlost(void * context, char * cause)
 {
-    MQTTAsync client                   = (MQTTAsync)context;
-    MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
-    int rc;
-    connected = 0;
-
     printf("\nConnection lost\n");
     if(cause) printf("     cause: %s\n", cause);
 
     printf("Reconnecting\n");
-    conn_opts.keepAliveInterval = 20;
-    conn_opts.cleansession      = 1;
-    if((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS) {
-        printf("Failed to start connect, return code %d\n", rc);
-    }
+    mqttStart();
 }
 
 // Receive incoming messages
@@ -185,8 +176,8 @@ static void mqtt_message_cb(char * topic, char * payload, unsigned int length)
 
 int msgarrvd(void * context, char * topicName, int topicLen, MQTTAsync_message * message)
 {
-    printf("MQT RCV >> ");
-    printf("%s => %.*s (%d)\n", topicName, message->payloadlen, (char *)message->payload, message->payloadlen);
+    // printf("MQT RCV >> ");
+    // printf("%s => %.*s (%d)\n", topicName, message->payloadlen, (char *)message->payload, message->payloadlen);
 
     char msg[message->payloadlen + 1];
     memcpy(msg, (char *)message->payload, message->payloadlen);
@@ -256,6 +247,8 @@ void onConnect(void * context, MQTTAsync_successData * response)
     mqtt_subscribe(context, TOPIC "light");
     mqtt_subscribe(context, TOPIC "dim");
 
+    mqttPublish(TOPIC LWT_TOPIC, "online", false);
+
     mqtt_send_object_state(0, 0, "connected");
     std::cout << std::endl;
 }
@@ -272,7 +265,7 @@ void onSendFailure(void * context, MQTTAsync_failureData * response)
     opts.context   = client;
     if((rc = MQTTAsync_disconnect(client, &opts)) != MQTTASYNC_SUCCESS) {
         printf("Failed to start disconnect, return code %d\n", rc);
-        exit(EXIT_FAILURE);
+        //exit(EXIT_FAILURE);
     }
 }
 
@@ -282,7 +275,8 @@ void onSend(void * context, MQTTAsync_successData * response)
     MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
     int rc;
 
-    printf("Message with token value %d delivery confirmed\n", response->token);
+    // printf("Message with token value %d delivery confirmed\n", response->token);
+
     // opts.onSuccess = onDisconnect;
     // opts.onFailure = onDisconnectFailure;
     // opts.context = client;
@@ -346,6 +340,7 @@ void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char * payload)
 void mqttStart()
 {
     MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+    MQTTAsync_willOptions will_opts    = MQTTAsync_willOptions_initializer;
     int rc;
     int ch;
 
@@ -362,11 +357,18 @@ void mqttStart()
         return;
     }
 
+    conn_opts.will            = &will_opts;
+    conn_opts.will->message   = "offline";
+    conn_opts.will->qos       = 1;
+    conn_opts.will->retained  = 0;
+    conn_opts.will->topicName = "hasp/plate35/LWT";
+
     conn_opts.keepAliveInterval = 20;
     conn_opts.cleansession      = 1;
     conn_opts.onSuccess         = onConnect;
     conn_opts.onFailure         = onConnectFailure;
     conn_opts.context           = mqtt_client;
+
     if((rc = MQTTAsync_connect(mqtt_client, &conn_opts)) != MQTTASYNC_SUCCESS) {
         printf("Failed to start connect, return code %d\n", rc);
         rc = EXIT_FAILURE;
diff --git a/src/mqtt/hasp_mqtt_pubsubclient.cpp b/src/mqtt/hasp_mqtt_pubsubclient.cpp
index 70701959..0bcfa252 100644
--- a/src/mqtt/hasp_mqtt_pubsubclient.cpp
+++ b/src/mqtt/hasp_mqtt_pubsubclient.cpp
@@ -36,8 +36,8 @@ EthernetClient mqttNetworkClient;
             #endif
         #endif
 
-        #include "hasp_hal.h"
-        #include "log/hasp_debug.h"
+        #include "hal/hasp_hal.h"
+        #include "hasp_debug.h"
         #include "hasp_config.h"
 
         #include "../hasp/hasp_dispatch.h"