diff --git a/command.c b/command.c
index 2a613b4688..30d4df4d66 100644
--- a/command.c
+++ b/command.c
@@ -1790,7 +1790,9 @@ void handle_quit_event()
    command_event(CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET, NULL);
 
 #ifdef HAVE_DYNAMIC
-   command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
+#ifdef HAVE_MENU
+   menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
+#endif
 #endif
 
    runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
@@ -1846,20 +1848,15 @@ bool command_event(enum event_command cmd, void *data)
                runloop_msg_queue_push(msg, 1, 100, true);
             }
          }
-#endif
-         break;
-      case CMD_EVENT_LOAD_CORE_DEINIT:
-#ifdef HAVE_MENU
-         menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
 #endif
          break;
       case CMD_EVENT_LOAD_CORE_PERSIST:
-         command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
          {
 #ifdef HAVE_MENU
             bool *ptr = NULL;
             struct retro_system_info *system = NULL;
 
+            menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
             menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &system);
 
             if (menu_driver_ctl(RARCH_MENU_CTL_LOAD_NO_CONTENT_GET, &ptr))
@@ -1991,7 +1988,9 @@ bool command_event(enum event_command cmd, void *data)
                      NULL, NULL))
                return false;
 #ifdef HAVE_DYNAMIC
-         command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
+#ifdef HAVE_MENU
+         menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
+#endif
 #else
          core_unload_game();
          core_unload();
diff --git a/command.h b/command.h
index 55728fbeb2..4a3cd2eca6 100644
--- a/command.h
+++ b/command.h
@@ -43,7 +43,6 @@ enum event_command
    CMD_EVENT_SET_PER_GAME_RESOLUTION,
    CMD_EVENT_SET_FRAME_LIMIT,
    /* Loads core. */
-   CMD_EVENT_LOAD_CORE_DEINIT,
    CMD_EVENT_LOAD_CORE,
    CMD_EVENT_LOAD_CORE_PERSIST,
    CMD_EVENT_UNLOAD_CORE,