diff --git a/src/query_utils.cpp b/src/query_utils.cpp
index 6ba02ca..1518b1b 100644
--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -51,12 +51,12 @@ namespace QUERY_Utils {
             // agregar callsign para completar donde esta X callsign --> posicion
             Serial.println("estaciones escuchadas directo (ultimos 30 min)");
             answer.concat("?WHERE on development 73!");
-        } else if (queryQuestion.indexOf("?APRSEEM") == 0) {    // Exit DigiRepeater EcoMode
+        } else if (queryQuestion.indexOf("?APRSEEM") == 0 && Config.digi.ecoMode == true) {    // Exit DigiRepeater EcoMode
             answer = "DigiEcoMode:Stop";
             Config.digi.ecoMode     = false;
             Config.display.alwaysOn = true;
             Config.display.timeout  = 10;
-        } else if (queryQuestion.indexOf("?APRSSEM") == 0) {    // Start DigiRepeater EcoMode
+        } else if (queryQuestion.indexOf("?APRSSEM") == 0 && Config.digi.ecoMode == false) {    // Start DigiRepeater EcoMode
             answer = "DigiEcoMode:Start";
             Config.digi.ecoMode     = true;
         } else if (queryQuestion.indexOf("?APRSEMS") == 0) {    // DigiRepeater EcoMode Status