diff --git a/command_event.c b/command_event.c
index c1c51f8e4d..dfa938099b 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1625,13 +1625,6 @@ bool event_command(enum event_command cmd)
          if (global->sram.use)
             event_command(EVENT_CMD_AUTOSAVE_INIT);
          break;
-      case EVENT_CMD_MSG_QUEUE_DEINIT:
-         rarch_main_msg_queue_free();
-         break;
-      case EVENT_CMD_MSG_QUEUE_INIT:
-         event_command(EVENT_CMD_MSG_QUEUE_DEINIT);
-         rarch_main_msg_queue_init();
-         break;
       case EVENT_CMD_BSV_MOVIE_DEINIT:
          if (!global)
             break;
diff --git a/command_event.h b/command_event.h
index fc96ea19e0..2c9166b7da 100644
--- a/command_event.h
+++ b/command_event.h
@@ -147,10 +147,6 @@ enum event_command
    EVENT_CMD_SAVEFILES_INIT,
    /* Deinitializes savefiles. */
    EVENT_CMD_SAVEFILES_DEINIT,
-   /* Initializes message queue. */
-   EVENT_CMD_MSG_QUEUE_INIT,
-   /* Deinitializes message queue. */
-   EVENT_CMD_MSG_QUEUE_DEINIT,
    /* Initializes cheats. */
    EVENT_CMD_CHEATS_INIT,
    /* Deinitializes cheats. */
diff --git a/retroarch.c b/retroarch.c
index 4561ed69e9..44826375c8 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1090,12 +1090,12 @@ void rarch_main_new(void)
    init_state();
    main_init_state_config();
 
-   event_command(EVENT_CMD_MSG_QUEUE_INIT);
+   rarch_main_ctl(RARCH_MAIN_CTL_MSG_QUEUE_INIT, NULL);
 }
 
 void rarch_main_free(void)
 {
-   event_command(EVENT_CMD_MSG_QUEUE_DEINIT);
+   rarch_main_ctl(RARCH_MAIN_CTL_MSG_QUEUE_DEINIT, NULL);
    event_command(EVENT_CMD_DRIVERS_DEINIT);
    event_command(EVENT_CMD_LOG_FILE_DEINIT);
 
diff --git a/runloop.c b/runloop.c
index a00702216f..7ee7f02455 100644
--- a/runloop.c
+++ b/runloop.c
@@ -646,6 +646,13 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
             *ptr = main_is_paused;
          }
          break;
+      case RARCH_MAIN_CTL_MSG_QUEUE_DEINIT:
+         rarch_main_msg_queue_free();
+         break;
+      case RARCH_MAIN_CTL_MSG_QUEUE_INIT:
+         rarch_main_ctl(RARCH_MAIN_CTL_MSG_QUEUE_DEINIT, NULL);
+         rarch_main_msg_queue_init();
+         break;
       default:
          return false;
    }
diff --git a/runloop.h b/runloop.h
index 415f2003e9..48fef02493 100644
--- a/runloop.h
+++ b/runloop.h
@@ -65,7 +65,11 @@ enum rarch_main_ctl_state
    RARCH_MAIN_CTL_CHECK_MOVIE_RECORD,
    /* Checks if slowmotion toggle/hold was being pressed and/or held. */
    RARCH_MAIN_CTL_CHECK_SLOWMOTION,
-   RARCH_MAIN_CTL_CHECK_PAUSE_STATE
+   RARCH_MAIN_CTL_CHECK_PAUSE_STATE,
+   /* Initializes message queue. */
+   RARCH_MAIN_CTL_MSG_QUEUE_INIT,
+   /* Deinitializes message queue. */
+   RARCH_MAIN_CTL_MSG_QUEUE_DEINIT
 };
 
 typedef struct rarch_dir_list