diff --git a/sonoff/xdrv_01_webserver.ino b/sonoff/xdrv_01_webserver.ino
index b81624bd7..d4d950b77 100644
--- a/sonoff/xdrv_01_webserver.ino
+++ b/sonoff/xdrv_01_webserver.ino
@@ -1345,16 +1345,19 @@ void HandleInformation(void)
 #else
   func += F(D_DISABLED);
 #endif // USE_EMULATION
-
   func += F("}1" D_MDNS_DISCOVERY "}2");
 #ifdef USE_DISCOVERY
-  func += F(D_ENABLED);
-  func += F("}1" D_MDNS_ADVERTISE "}2");
+  if (Settings.flag3.mdns_enabled) {
+    func += F(D_ENABLED);
+    func += F("}1" D_MDNS_ADVERTISE "}2");
 #ifdef WEBSERVER_ADVERTISE
-  func += F(D_WEB_SERVER);
+    func += F(D_WEB_SERVER);
 #else
-  func += F(D_DISABLED);
+    func += F(D_DISABLED);
 #endif // WEBSERVER_ADVERTISE
+  } else {
+    func += F(D_DISABLED);
+  }
 #else
   func += F(D_DISABLED);
 #endif // USE_DISCOVERY
diff --git a/tools/decode-status.py b/tools/decode-status.py
index b45cb245a..63655f5a6 100644
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -89,13 +89,13 @@ a_setoption = [[
     "Add UTC time offset to JSON message",
     "Show hostname and IP address in GUI",
     "Apply SetOption20 to Tuya",
-    "Use short Hass discovery messages",
+    "mDNS enabled",
     "Use wifi network scan at restart",
     "Use wifi network rescan regularly",
     "Add IR raw data to JSON message",
     "Change state topic from tele/STATE to stat/RESULT",
     "Enable normal sleep instead of dynamic sleep",
-    "",
+    "Force local operation when button/switch topic is set",
     "","","","",
     "","","","",
     "","","","",