diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6789c18eb..99afc7ea7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -176,6 +176,7 @@ Version 6.3.0 20181030
  * Add command SetOption52 to control display of optional time offset from UTC in JSON messages (#3629, #3711)
  * Add command RGBWWTable to support color calibration (#3933)
  * Add command Reset 4 (reset to defaults but keep wifi params) and Reset 5 (as reset 4 and also erase flash) (#4061)
+ * Add command SetOption35 0..255 (seconds) to delay mDNS initialization to control possible Wifi connect problems
  * Add authentication to HTTP web pages
  * Add decimals as input to commands PowerSet, VoltageSet and CurrentSet
  * Add tools/decode-config.py by Norbert Richter to decode configuration data. See file for information
diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index d6441da47..0861b29a0 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -58,6 +58,7 @@
  * Add command SetOption52 to control display of optional time offset from UTC in JSON messages (#3629, #3711)
  * Add command RGBWWTable to support color calibration (#3933)
  * Add command Reset 4 (reset to defaults but keep wifi params) and Reset 5 (as reset 4 and also erase flash) (#4061)
+ * Add command SetOption35 0..255 (seconds) to delay mDNS initialization to control possible Wifi connect problems
  * Add authentication to HTTP web pages
  * Add decimals as input to commands PowerSet, VoltageSet and CurrentSet
  * Add tools/decode-config.py by Norbert Richter to decode configuration data. See file for information
diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h
index 7e096f673..d91c66bda 100644
--- a/sonoff/language/bg-BG.h
+++ b/sonoff/language/bg-BG.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "h"
 #define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_INCREMENTS "inc"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index 6a783a45b..0c2ab9f6a 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "h"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
index 937464699..c5a3db324 100644
--- a/sonoff/language/el-GR.h
+++ b/sonoff/language/el-GR.h
@@ -1,3 +1,4 @@
+
 /*
   el-GR.h - localization for Greek - Greece for Sonoff-Tasmota
 
@@ -537,7 +538,7 @@
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index 925080d3d..48641d0ff 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
index d78c807da..a5d044985 100644
--- a/sonoff/language/es-AR.h
+++ b/sonoff/language/es-AR.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index bb32c2d2e..0e37d9990 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "h"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/he-HE.h b/sonoff/language/he-HE.h
index d1aee3423..355fe8231 100644
--- a/sonoff/language/he-HE.h
+++ b/sonoff/language/he-HE.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index 91b005e39..cbe52378d 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "ó"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index 2ed03ca35..8449d250d 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index ca7be61af..afaf9d08a 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "h"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index 3fd26f29b..686f5cc76 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Godz"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h
index dceadf085..ef5104fdb 100644
--- a/sonoff/language/pt-BR.h
+++ b/sonoff/language/pt-BR.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "H"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index a7b9236ae..97750f38c 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index fc2dc2892..28aa1d7f2 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Ч"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "кОм"
 #define D_UNIT_KILOWATTHOUR "кВт"
 #define D_UNIT_LUX "лк"
diff --git a/sonoff/language/tr-TR.h b/sonoff/language/tr-TR.h
index ea3f10ce6..0588b5175 100755
--- a/sonoff/language/tr-TR.h
+++ b/sonoff/language/tr-TR.h
@@ -536,7 +536,7 @@
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
diff --git a/sonoff/language/uk-UK.h b/sonoff/language/uk-UK.h
index cf9d8bcf3..fc32479fc 100644
--- a/sonoff/language/uk-UK.h
+++ b/sonoff/language/uk-UK.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "Г"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "кОм"
 #define D_UNIT_KILOWATTHOUR "кВт"
 #define D_UNIT_LUX "лк"
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index 15708dded..f4a19e324 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -536,7 +536,7 @@
 #define D_UNIT_HOUR "时"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "千欧"
 #define D_UNIT_KILOWATTHOUR "千瓦时"
 #define D_UNIT_LUX "勒克斯"
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index 75c682396..61fa90d4d 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -537,7 +537,7 @@
 #define D_UNIT_HOUR "時"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOGRAM "kg"
-#define D_UNIT_KILOMETER_PER_HOUR "kmph"  // or "km/h"
+#define D_UNIT_KILOMETER_PER_HOUR "km/h"  // or "km/h"
 #define D_UNIT_KILOOHM "千歐"
 #define D_UNIT_KILOWATTHOUR "千瓦時"
 #define D_UNIT_LUX "勒克斯"
diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h
index 70e0e9a3d..15d003cd1 100644
--- a/sonoff/sonoff.h
+++ b/sonoff/sonoff.h
@@ -202,7 +202,7 @@ enum ButtonStates { PRESSED, NOT_PRESSED };
 
 enum Shortcuts { SC_CLEAR, SC_DEFAULT, SC_USER };
 
-enum SettingsParmaIndex {P_HOLD_TIME, P_MAX_POWER_RETRY, P_TUYA_DIMMER_ID, P_MAX_PARAM8};
+enum SettingsParmaIndex {P_HOLD_TIME, P_MAX_POWER_RETRY, P_TUYA_DIMMER_ID, P_MDNS_DELAYED_START, P_MAX_PARAM8};  // Max is PARAM8_SIZE (18)
 
 enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, DZ_ILLUMINANCE, DZ_COUNT, DZ_VOLTAGE, DZ_CURRENT, DZ_AIRQUALITY, DZ_MAX_SENSORS};
 
diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index 153e55fb7..5eadb50a8 100755
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -186,6 +186,7 @@ byte reset_web_log_flag = 0;                // Reset web console log
 byte devices_present = 0;                   // Max number of devices supported
 byte seriallog_level;                       // Current copy of Settings.seriallog_level
 byte syslog_level;                          // Current copy of Settings.syslog_level
+byte mdns_delayed_start = 0;                // mDNS delayed start
 boolean latest_uptime_flag = true;          // Signal latest uptime
 boolean pwm_present = false;                // Any PWM channel configured with SetOption15 0
 boolean mdns_begun = false;                 // mDNS active
@@ -2580,6 +2581,7 @@ void setup()
   }
 
   baudrate = Settings.baudrate * 1200;
+  mdns_delayed_start = Settings.param[P_MDNS_DELAYED_START];
   seriallog_level = Settings.seriallog_level;
   seriallog_timer = SERIALLOG_TIMER;
 #ifndef USE_EMULATION
diff --git a/sonoff/support.ino b/sonoff/support.ino
index bb6c68bb8..67d55a8ab 100644
--- a/sonoff/support.ino
+++ b/sonoff/support.ino
@@ -1557,19 +1557,29 @@ void WifiCheck(uint8_t param)
           ota_state_flag = 3;
         }
 #endif  // BE_MINIMAL
+
 #ifdef USE_DISCOVERY
         if (!mdns_begun) {
-          mdns_begun = MDNS.begin(my_hostname);
-          snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS "%s"), (mdns_begun) ? D_INITIALIZED : D_FAILED);
-          AddLog(LOG_LEVEL_INFO);
+          if (mdns_delayed_start) {
+            AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS D_ATTEMPTING_CONNECTION));
+            mdns_delayed_start--;
+          } else {
+            mdns_delayed_start = Settings.param[P_MDNS_DELAYED_START];
+            mdns_begun = MDNS.begin(my_hostname);
+            snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS "%s"), (mdns_begun) ? D_INITIALIZED : D_FAILED);
+            AddLog(LOG_LEVEL_INFO);
+          }
         }
 #endif  // USE_DISCOVERY
+
 #ifdef USE_WEBSERVER
         if (Settings.webserver) {
           StartWebserver(Settings.webserver, WiFi.localIP());
 #ifdef USE_DISCOVERY
 #ifdef WEBSERVER_ADVERTISE
-          MDNS.addService("http", "tcp", WEB_PORT);
+          if (mdns_begun) {
+            MDNS.addService("http", "tcp", WEB_PORT);
+          }
 #endif  // WEBSERVER_ADVERTISE
 #endif  // USE_DISCOVERY
         } else {
@@ -1579,12 +1589,14 @@ void WifiCheck(uint8_t param)
         if (Settings.flag2.emulation) { UdpConnect(); }
 #endif  // USE_EMULATION
 #endif  // USE_WEBSERVER
+
 #ifdef USE_KNX
         if (!knx_started && Settings.flag.knx_enabled) {
           KNXStart();
           knx_started = true;
         }
 #endif  // USE_KNX
+
       } else {
         WifiState(0);
 #if defined(USE_WEBSERVER) && defined(USE_EMULATION)
@@ -1645,38 +1657,6 @@ void EspRestart()
   ESP.restart();
 }
 
-#ifdef USE_DISCOVERY
-/*********************************************************************************************\
- * mDNS
-\*********************************************************************************************/
-
-#ifdef MQTT_HOST_DISCOVERY
-boolean MdnsDiscoverMqttServer()
-{
-  if (!mdns_begun) {
-    return false;
-  }
-
-  int n = MDNS.queryService("mqtt", "tcp");  // Search for mqtt service
-
-  snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS D_QUERY_DONE " %d"), n);
-  AddLog(LOG_LEVEL_INFO);
-
-  if (n > 0) {
-    // Note: current strategy is to get the first MQTT service (even when many are found)
-    snprintf_P(Settings.mqtt_host, sizeof(Settings.mqtt_host), MDNS.IP(0).toString().c_str());
-    Settings.mqtt_port = MDNS.port(0);
-
-    snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS D_MQTT_SERVICE_FOUND " %s, " D_IP_ADDRESS " %s, " D_PORT " %d"),
-      MDNS.hostname(0).c_str(), Settings.mqtt_host, Settings.mqtt_port);
-    AddLog(LOG_LEVEL_INFO);
-  }
-
-  return n > 0;
-}
-#endif  // MQTT_HOST_DISCOVERY
-#endif  // USE_DISCOVERY
-
 /*********************************************************************************************\
  * Basic I2C routines
 \*********************************************************************************************/
diff --git a/sonoff/xdrv_02_mqtt.ino b/sonoff/xdrv_02_mqtt.ino
index bb1a86e13..ed24d31ed 100644
--- a/sonoff/xdrv_02_mqtt.ino
+++ b/sonoff/xdrv_02_mqtt.ino
@@ -197,6 +197,32 @@ void MqttLoop()
 
 /*********************************************************************************************/
 
+#ifdef USE_DISCOVERY
+#ifdef MQTT_HOST_DISCOVERY
+boolean MqttDiscoverServer()
+{
+  if (!mdns_begun) { return false; }
+
+  int n = MDNS.queryService("mqtt", "tcp");  // Search for mqtt service
+
+  snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS D_QUERY_DONE " %d"), n);
+  AddLog(LOG_LEVEL_INFO);
+
+  if (n > 0) {
+    // Note: current strategy is to get the first MQTT service (even when many are found)
+    snprintf_P(Settings.mqtt_host, sizeof(Settings.mqtt_host), MDNS.IP(0).toString().c_str());
+    Settings.mqtt_port = MDNS.port(0);
+
+    snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS D_MQTT_SERVICE_FOUND " %s, " D_IP_ADDRESS " %s, " D_PORT " %d"),
+      MDNS.hostname(0).c_str(), Settings.mqtt_host, Settings.mqtt_port);
+    AddLog(LOG_LEVEL_INFO);
+  }
+
+  return n > 0;
+}
+#endif  // MQTT_HOST_DISCOVERY
+#endif  // USE_DISCOVERY
+
 int MqttLibraryType()
 {
   return (int)MQTT_LIBRARY_TYPE;
@@ -468,9 +494,7 @@ void MqttReconnect()
 #ifndef USE_MQTT_TLS
 #ifdef USE_DISCOVERY
 #ifdef MQTT_HOST_DISCOVERY
-  if (!strlen(Settings.mqtt_host)) {
-    MdnsDiscoverMqttServer();
-  }
+  if (!strlen(Settings.mqtt_host) && !MqttDiscoverServer()) { return; }
 #endif  // MQTT_HOST_DISCOVERY
 #endif  // USE_DISCOVERY
 #endif  // USE_MQTT_TLS
@@ -539,6 +563,13 @@ void MqttCheck()
     if (!MqttIsConnected()) {
       global_state.mqtt_down = 1;
       if (!mqtt_retry_counter) {
+#ifndef USE_MQTT_TLS
+#ifdef USE_DISCOVERY
+#ifdef MQTT_HOST_DISCOVERY
+        if (!strlen(Settings.mqtt_host) && !mdns_begun) { return; }
+#endif  // MQTT_HOST_DISCOVERY
+#endif  // USE_DISCOVERY
+#endif  // USE_MQTT_TLS
         MqttReconnect();
       } else {
         mqtt_retry_counter--;
diff --git a/sonoff/xplg_wemohue.ino b/sonoff/xplg_wemohue.ino
index 2f70174f0..8bd5e529c 100644
--- a/sonoff/xplg_wemohue.ino
+++ b/sonoff/xplg_wemohue.ino
@@ -664,7 +664,7 @@ void HueLights(String *path)
       response = "[";
 
       StaticJsonBuffer<400> jsonBuffer;
-      JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg("1"));
+      JsonObject &hue_json = jsonBuffer.parseObject(WebServer->arg((WebServer->args())-1));
       if (hue_json.containsKey("on")) {
 
         response += FPSTR(HUE_LIGHT_RESPONSE_JSON);
@@ -809,6 +809,11 @@ void HandleHueApi(String *path)
    * user part and allow every caller as with Web or WeMo.
    *
    * (c) Heiko Krupp, 2017
+   *
+   * Hue URL
+   * http://sonoff/api/username/lights/1/state with post data {"on":true,"hue":56100,"sat":254,"bri":254,"alert":"none","transitiontime":40}
+   * is converted by webserver to
+   * http://sonoff/api/username/lights/1/state with arg plain={"on":true,"hue":56100,"sat":254,"bri":254,"alert":"none","transitiontime":40}
    */
 
   uint8_t args = 0;