diff --git a/frontend/frontend.c b/frontend/frontend.c
index b0f08cda22..3d4a311205 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -64,14 +64,11 @@ void main_exit(void *args)
 
    event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL);
 
-   if (content_ctl(CONTENT_CTL_IS_INITED, NULL))
-   {
 #ifdef HAVE_MENU
-      /* Do not want menu context to live any more. */
-      menu_driver_ctl(RARCH_MENU_CTL_UNSET_OWN_DRIVER, NULL);
+   /* Do not want menu context to live any more. */
+   menu_driver_ctl(RARCH_MENU_CTL_UNSET_OWN_DRIVER, NULL);
 #endif
-      rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL);
-   }
+   rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL);
 
    event_cmd_ctl(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG, NULL);
 
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index f30c64319a..8ae0f75c75 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -613,6 +613,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
          menu_driver_data_own = true;
          break;
       case RARCH_MENU_CTL_UNSET_OWN_DRIVER:
+         if (!content_ctl(CONTENT_CTL_IS_INITED, NULL))
+            return false;
          menu_driver_data_own = false;
          break;
       case RARCH_MENU_CTL_SET_TEXTURE: