diff --git a/src/publisher/pubMqtt.h b/src/publisher/pubMqtt.h
index 721cc2ff..c9ddae27 100644
--- a/src/publisher/pubMqtt.h
+++ b/src/publisher/pubMqtt.h
@@ -235,7 +235,7 @@ class PubMqtt {
             else
                 snprintf(mTopic.data(), mTopic.size(), "%s", subTopic);
 
-            if(!mCfgMqtt->enableRetain)
+            if(!mCfgMqtt->enableRetain && String(mTopic.data()) != String(mLwtTopic.data()))
                 retained = false;
 
             mClient.publish(mTopic.data(), qos, retained, payload);