diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index d587bba0b..1a5afe520 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -501,19 +501,10 @@ void MyESP::_mqtt_setup() {
     mqttClient.setCleanSession(false);
 
     // last will
-
-    /****************
-     * 
-     * disabling last will, since version 1.9.5
-     *
-
     if (_hasValue(_mqtt_will_topic)) {
-        mqttClient.setWill(_mqttTopic(_mqtt_will_topic), 1, true,
-                           _mqtt_will_offline_payload); // retain always true
+        mqttClient.setWill(_mqttTopic(_mqtt_will_topic), 1, true, _mqtt_will_offline_payload); // retain always true
     }
 
-    */
-
     // set credentials if we have them
     if (_hasValue(_mqtt_user)) {
         mqttClient.setCredentials(_mqtt_user, _mqtt_password);