diff --git a/tasmota/tasmota_xdrv_driver/xdrv_84_esp32_hosted.ino b/tasmota/tasmota_xdrv_driver/xdrv_84_esp32_hosted.ino
index 0a2c8f2f4..75be6f101 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_84_esp32_hosted.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_84_esp32_hosted.ino
@@ -110,6 +110,7 @@ void HostedMCUStatus(void) {
 void HostedMCUEverySecond(void) {
   if (!CommandsReady()) { return; }
 
+#ifdef ESP_HOSTED_NEW_OTA
   if (Hosted.ota_file_state_flag) {
     Hosted.ota_file_state_flag--;
     if (Hosted.ota_file_state_flag <= 0) {
@@ -178,7 +179,8 @@ void HostedMCUEverySecond(void) {
       MqttPublishPrefixTopicRulesProcess_P(STAT, PSTR(D_CMND_HOSTEDLOAD));
     }
   }
-  else if (Hosted.ota_http_state_flag) {
+#endif  // ESP_HOSTED_NEW_OTA
+  if (Hosted.ota_http_state_flag) {
     Hosted.ota_http_state_flag--;
 /*
     if (2 == Hosted.ota_http_state_flag) {
@@ -277,10 +279,18 @@ void HostedMCUEverySecond(void) {
 \*********************************************************************************************/
 
 const char kHostedCommands[] PROGMEM = "Hosted|"  // Prefix
-  "|Load|Ota";
+  "|"
+#ifdef ESP_HOSTED_NEW_OTA      
+  "Load|"
+#endif  // ESP_HOSTED_NEW_OTA      
+  "Ota";
 
 void (* const HostedCommand[])(void) PROGMEM = {
-  &CmndHosted, &CmndHostedLoad, &CmndHostedOta };
+  &CmndHosted,
+#ifdef ESP_HOSTED_NEW_OTA      
+  &CmndHostedLoad,
+#endif  // ESP_HOSTED_NEW_OTA      
+  &CmndHostedOta };
 
 void CmndHosted(void) {
   Response_P(PSTR("{\"Hosted\":{\"Host\":\"%s\",\"Hosted\":\"%s\",\"MCU\":\"%s\"}}"),
@@ -288,6 +298,7 @@ void CmndHosted(void) {
   );
 }
 
+#ifdef ESP_HOSTED_NEW_OTA      
 void CmndHostedLoad(void) {
   /*
   Expect files in folder /coprocessor/v2.0.17/network_adapter_esp32c6.bin
@@ -296,6 +307,8 @@ void CmndHostedLoad(void) {
   Or allow user to enter required version like:
    HostedLoad v2.0.17
   */
+//  if (GetHostedMCUFwVersion() < 0x00020600) { return; }
+
   Hosted.ota_url = (char*)calloc(200, sizeof(char));
   if (!Hosted.ota_url) { return; }                 // Unable to allocate memory
   if (XdrvMailbox.data_len > 15) {
@@ -312,6 +325,7 @@ void CmndHostedLoad(void) {
   Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), 
     XdrvMailbox.command, GetHostedFwVersion(ESP_HOSTED).c_str(), Hosted.ota_url);
 }
+#endif  // ESP_HOSTED_NEW_OTA      
 
 void CmndHostedOta(void) {
   /*