diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index b59afc98..4e6f5c70 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -162,7 +162,7 @@ void loop() {
             APRS_IS_Utils::processLoRaPacket(packet); // Send received packet to APRSIS
         }
 
-        if (Config.digi.mode == 2 || Config.digi.mode == 3 || backUpDigiMode) { // If Digi enabled
+        if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backUpDigiMode)) { // If Digi enabled
             STATION_Utils::clean25SegBuffer();
             DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi            
         }
diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp
index b8efbbba..d1210bd3 100644
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -63,6 +63,7 @@ namespace GPS_Utils {
             Config.aprs_is.objectsToRF  = false;
             Config.beacon.sendViaRF     = false;
             Config.digi.mode            = 0;
+            Config.backupDigiMode       = false;
         }   
         String beaconPacket = Config.callsign;
         beaconPacket += ">APLRG1";