diff --git a/data_embed/index.html b/data_embed/index.html
index 8394515..8e3b1b9 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -669,13 +669,13 @@
                                             id="digi.ecoMode"
                                         >
                                             <option value="0">
-                                                OFF (Normal Mode)
+                                                OFF (Normal Mode - WiFiAP enabled)
                                             </option>
                                             <option value="1">
                                                 Ultra Eco Mode (Sleep till Packet Rx (WiFiAP/WebUI & Display disabled))
                                             </option>
                                             <option value="2">
-                                                OFF (Normal Mode without WiFiAP)
+                                                OFF (Normal Mode - WiFiAP disabled)
                                             </option>
                                         </select>
                                     </div>
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 2dff600..2c29fcc 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -48,7 +48,7 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2025-05-18";
+String              versionDate             = "2025-06-11";
 Configuration       Config;
 WiFiClient          espClient;
 #ifdef HAS_GPS
diff --git a/src/query_utils.cpp b/src/query_utils.cpp
index 87de3a7..3eb50a3 100644
--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -58,8 +58,8 @@ namespace QUERY_Utils {
         else if (STATION_Utils::isManager(station) && (!queryFromAPRSIS || !Config.remoteManagement.rfOnly)) {
             if (queryQuestion.indexOf("?EM=OFF") == 0) {
                 if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
-                    if (Config.digi.ecoMode == 1) {     // Exit Digipeater EcoMode
-                        answer = "DigiEcoMode:OFF";
+                    if (Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) { // Exit Digipeater EcoMode or Digipeater without WiFiAP
+                        answer = (Config.digi.ecoMode == 1) ? "DigiEcoMode:OFF" : "Digipeater + WiFiAP enabled";
                         Config.digi.ecoMode         = 0;
                         Config.display.alwaysOn     = true;
                         Config.display.timeout      = 10;
@@ -69,7 +69,7 @@ namespace QUERY_Utils {
                         answer = "DigiEcoMode was OFF";
                     }
                 } else {
-                    answer = "DigiEcoMode control not possible";
+                    answer = "Digipeater Mode control not possible";
                 }
             } else if (queryQuestion.indexOf("?EM=ON") == 0) {
                 if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
@@ -82,7 +82,7 @@ namespace QUERY_Utils {
                         answer = "DigiEcoMode was ON";
                     }
                 } else {
-                    answer = "DigiEcoMode control not possible";
+                    answer = "Digipeater Mode control not possible";
                 }
             } else if (queryQuestion.indexOf("?EM=?") == 0) {    // Digipeater EcoMode Status
                 if (Config.digi.ecoMode == 0) {