diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 4f8fa21..b8d457b 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -47,7 +47,7 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2025.03.19";
+String              versionDate             = "2025.03.20";
 Configuration       Config;
 WiFiClient          espClient;
 #ifdef HAS_GPS
diff --git a/src/query_utils.cpp b/src/query_utils.cpp
index 52b89ca..3b29c40 100644
--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -57,7 +57,7 @@ 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) {
+                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
                     if (Config.digi.ecoMode) {    // Exit Digipeater EcoMode
                         answer = "DigiEcoMode:OFF";
                         Config.digi.ecoMode         = false;
@@ -72,7 +72,7 @@ namespace QUERY_Utils {
                     answer = "DigiEcoMode 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) {
+                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
                     if (!Config.digi.ecoMode) {     // Start Digipeater EcoMode
                         answer = "DigiEcoMode:ON";
                         Config.digi.ecoMode         = true;