diff --git a/command.c b/command.c
index b82fc88bf6..caf2402215 100644
--- a/command.c
+++ b/command.c
@@ -2170,19 +2170,18 @@ TODO: Add a setting for these tweaks */
          break;
       case CMD_EVENT_RECORD_DEINIT:
          {
+            recording_set_state(false);
+            streaming_set_state(false);
             if (!recording_deinit())
                return false;
          }
          break;
       case CMD_EVENT_RECORD_INIT:
          {
-            command_event(CMD_EVENT_RECORD_DEINIT, NULL);
             recording_set_state(true);
             if (!recording_init())
             {
                command_event(CMD_EVENT_RECORD_DEINIT, NULL);
-               recording_set_state(false);
-               streaming_set_state(false);
                return false;
             }
          }
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index ce5e8990b8..059eacc894 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2699,8 +2699,6 @@ static int action_ok_start_streaming(const char *path,
 static int action_ok_stop_recording(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   recording_set_state(false);
-   streaming_set_state(false);
    command_event(CMD_EVENT_RECORD_DEINIT, NULL);
    return generic_action_ok_command(CMD_EVENT_RESUME);
 }
@@ -2708,8 +2706,6 @@ static int action_ok_stop_recording(const char *path,
 static int action_ok_stop_streaming(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   recording_set_state(false);
-   streaming_set_state(false);
    command_event(CMD_EVENT_RECORD_DEINIT, NULL);
    return generic_action_ok_command(CMD_EVENT_RESUME);
 }