diff --git a/Home-Assistant.md b/Home-Assistant.md
index 5824221f..a6bf5c17 100644
--- a/Home-Assistant.md
+++ b/Home-Assistant.md
@@ -65,16 +65,11 @@ On each Tasmota device which should be automatically discovered by Hass, enter t
  
 By executing command `SetOption19 1` the automatic discovery feature is enabled and a retained MQTT message starting with topic "homeassistant/..", as defined in user_config.h HOME_ASSISTANT_DISCOVERY_PREFIX, is sent containing parameters used by Home Assistant to automatically configure a device.
 
-To disable the automatic discovery feature and remove the retained message, execute command `SetOption19 0` and the homeassistant topic is removed from the MQTT server.\
-Note: This will also remove the device from Home Assistant.
+To disable the automatic discovery feature and remove the retained message, execute command `SetOption19 0` and the homeassistant topic is removed from Home Assistant and MQTT broker.\ Device topic will not revert to defaults, you have to manually change back the topic structure to `%prefix%/%topic%/` in [**MQTT Configuration**](MQTT).
 
-
-#### Important:
-To keep MQTT discovery messages short, "base topic" feature is used.\
-This feature is not compatible with the default Tasmota topic `prefix/topic/COMMAND`, e.g. `cmnd/sonoff/POWER`\
-The topic will automatically be changed to `topic/prefix/COMMAND`, e.g. `sonoff/cmnd/POWER`\
-If you want to use a custom `fulltopic`, it MUST end with `%prefix%/` or it will be overwritten with `topic/prefix/COMMAND`.\
-This is an example of an allowed `fulltopic`: `tasmota/%topic%/%prefix%/`.
+#### :warning: Important:
+This feature will change the default Tasmota topic `%prefix%/%topic%/COMMAND`, e.g. `cmnd/sonoff/POWER` to `%topic%/%prefix%/COMMAND`, e.g. `sonoff/cmnd/POWER`.
+You cannot use custom defined topics while `Setoption19` is on since it will always revert it to `%topic%/%prefix%` due to Home Assistant requirements.
 
 ## Setup Tasmota devices through Home Assistant
 All automatically discovered entities will show up under:\