diff --git a/src/configuration.cpp b/src/configuration.cpp
index fe83b32..4ffb2a6 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -87,6 +87,7 @@ bool Configuration::writeFile() {
 
         data["digi"]["mode"]                        = digi.mode;
         data["digi"]["ecoMode"]                     = digi.ecoMode;
+        if (digi.ecoMode == 1) data["aprs_is"]["active"] = false;
         #if defined(HAS_A7670)
             if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
         #endif
diff --git a/src/query_utils.cpp b/src/query_utils.cpp
index a2caa71..aee6710 100644
--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -101,7 +101,6 @@ namespace QUERY_Utils {
                     if (digiEcoMode == 0) {     // Start Digipeater EcoMode
                         answer = "DigiEcoMode:ON";
                         Config.digi.ecoMode         = 1;
-                        Config.aprs_is.active       = false;
                         shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sent before restart.
                         saveNewDigiEcoModeConfig    = true;
                     } else {