From 3432efddaaf846e8df6f37f5e29ce0d56a0c9c29 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Wed, 25 Aug 2021 12:23:42 +0200
Subject: [PATCH] Remember state of MQTT availability topics when reconfiguring
 (#55199)

---
 homeassistant/components/mqtt/mixins.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/mqtt/mixins.py b/homeassistant/components/mqtt/mixins.py
index a40f06a3bb6..11bf70ceceb 100644
--- a/homeassistant/components/mqtt/mixins.py
+++ b/homeassistant/components/mqtt/mixins.py
@@ -330,7 +330,10 @@ class MqttAvailability(Entity):
 
             self.async_write_ha_state()
 
-        self._available = {topic: False for topic in self._avail_topics}
+        self._available = {
+            topic: (self._available[topic] if topic in self._available else False)
+            for topic in self._avail_topics
+        }
         topics = {
             f"availability_{topic}": {
                 "topic": topic,