diff --git a/app/main.c b/app/main.c
index 6de437d..3e4a115 100644
--- a/app/main.c
+++ b/app/main.c
@@ -349,6 +349,11 @@ void channelMove(uint16_t Channel)
     //gRequestSaveVFO            = true;
     gVfoConfigureMode          = VFO_CONFIGURE_RELOAD;
 
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
+    gRemoveOffset = false;
+    gPowerHigh = false;
+#endif
+
     RADIO_ConfigureChannel(gEeprom.TX_VFO, gVfoConfigureMode);
     
     return;
@@ -823,6 +828,11 @@ static void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
     }
 #endif
 
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
+    gRemoveOffset = false;
+    gPowerHigh = false;
+#endif
+
     uint8_t Channel = gEeprom.ScreenChannel[gEeprom.TX_VFO];
 
     if (bKeyHeld || !bKeyPressed) { // key held or released
diff --git a/radio.c b/radio.c
index cb559f3..170083e 100644
--- a/radio.c
+++ b/radio.c
@@ -427,21 +427,19 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 
     pVfo->Compander = att.compander;
 
-    RADIO_ConfigureSquelchAndOutputPower(pVfo);
-
     #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if(gRemoveOffset)
     {
         pVfo->pTX = &pVfo->freq_config_RX;
-        gRequestSaveChannel = 1;
     }
 
     if(gPowerHigh)
     {
         pVfo->OUTPUT_POWER = OUTPUT_POWER_HIGH;
-        gRequestSaveChannel = 1;
     }
     #endif
+
+    RADIO_ConfigureSquelchAndOutputPower(pVfo);
 }
 
 void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)