diff --git a/CHANGELOG.md b/CHANGELOG.md
index c97aa5dcd..19ef82c5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,6 +114,7 @@
   - UL: Fix Hormann HSM 44bit static button code decoding (by @xMasterX)
   - UL: Sync signal delete scene with OFW (by @xMasterX)
   - UL: Fix incorrect rx key state when opening Read menu (by @xMasterX)
+  - UL: Fix crash on wrong rx key states (by @xMasterX)
   - OFW: Fixed transition to Saved menu after Delete RAW (by @Skorpionm)
 - Archive:
   - Fix favorite's parent folders thinking they are favorited too (by @Willy-JL)
diff --git a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
index 2a0b5e498..9e5289c54 100644
--- a/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
+++ b/applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c
@@ -69,8 +69,9 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
 
             return true;
         } else if(event.event == SubGhzCustomEventViewFreqAnalOkLong) {
-            // Don't need to save, we already saved on short event
-            //scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
+            // Don't need to save, we already saved on short event (and on exit event too)
+            subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
+            scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
             scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReceiver);
             return true;
         }
diff --git a/applications/main/subghz/scenes/subghz_scene_receiver.c b/applications/main/subghz/scenes/subghz_scene_receiver.c
index 23dd987e0..a0946b313 100644
--- a/applications/main/subghz/scenes/subghz_scene_receiver.c
+++ b/applications/main/subghz/scenes/subghz_scene_receiver.c
@@ -235,11 +235,11 @@ static void subghz_scene_add_to_history_callback(
                 subghz->state_notifications = SubGhzNotificationStateRxDone;
             }
         }
+        subghz_rx_key_state_set(subghz, SubGhzRxKeyStateAddKey);
     }
     subghz_receiver_reset(receiver);
     furi_string_free(item_name);
     furi_string_free(item_time);
-    subghz_rx_key_state_set(subghz, SubGhzRxKeyStateAddKey);
 }
 
 void subghz_scene_receiver_on_enter(void* context) {