diff --git a/retroarch.c b/retroarch.c
index f0b8de7a5e..6ccc2d848c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2380,15 +2380,14 @@ bool rarch_main_command(unsigned cmd)
          break;
       case RARCH_CMD_PREPARE_DUMMY:
          {
-            menu_handle_t *menu = menu_driver_get_ptr();
-            *global->fullpath = '\0';
-
-            (void)menu;
-
 #ifdef HAVE_MENU
+            menu_handle_t *menu = menu_driver_get_ptr();
             if (menu)
                menu->load_no_content = false;
 #endif
+            rarch_main_data_free();
+
+            *global->fullpath = '\0';
 
             rarch_main_set_state(RARCH_ACTION_STATE_LOAD_CONTENT);
             global->system.shutdown = false;
diff --git a/runloop.c b/runloop.c
index 3b11677585..ee95e2da0e 100644
--- a/runloop.c
+++ b/runloop.c
@@ -919,7 +919,6 @@ static int rarch_main_iterate_quit(void)
    if (global->core_shutdown_initiated
          && settings->load_dummy_on_core_shutdown)
    {
-      rarch_main_data_free();
       if (!rarch_main_command(RARCH_CMD_PREPARE_DUMMY))
          return -1;