diff --git a/App/app/action.c b/App/app/action.c
index 3c7d40fd..d2110c7c 100644
--- a/App/app/action.c
+++ b/App/app/action.c
@@ -360,23 +360,6 @@ void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 
     // held or released after short press beyond this point
     
-#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
-    if(gEeprom.MENU_LOCK) { // do not run these actions in RescueOps mode
-        switch (func) {
-            case ACTION_OPT_SCAN:
-            case ACTION_OPT_VFO_MR:
-    #ifdef ENABLE_FMRADIO
-            case ACTION_OPT_FM:
-    #endif
-                return;
-                break;
-
-            default:
-                break;
-        }
-    }
-#endif
-
 #ifdef ENABLE_FMRADIO
     if (gFmRadioMode) { // do not run these actions in FM radio mode
         switch (func) {
diff --git a/App/main.c b/App/main.c
index e3522787..1eb13710 100644
--- a/App/main.c
+++ b/App/main.c
@@ -129,7 +129,6 @@ void Main(void)
     if (BootMode == BOOT_MODE_RESCUE_OPS)
     {
         gEeprom.MENU_LOCK = !gEeprom.MENU_LOCK;
-        gEeprom.CURRENT_STATE = 0; // Don't resume is active...
         SETTINGS_SaveSettings();
     }