diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index c5501b1ebd..a70ac5143b 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -333,7 +333,8 @@ begin_shutdown:
 #endif
 
    system_deinit();
-   system_exitspawn();
+   if (g_extern.lifecycle_menu_state & (1 << MODE_EXITSPAWN))
+      system_exitspawn();
 
    return 1;
 }
diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
index 93714b0b1a..918289a25c 100644
--- a/frontend/platform/platform_gx.c
+++ b/frontend/platform/platform_gx.c
@@ -339,8 +339,7 @@ static void system_exitspawn(void)
 #ifdef IS_SALAMANDER
    rarch_console_exec(default_paths.libretro_path);
 #else
-   if (g_extern.lifecycle_menu_state & (1 << MODE_EXITSPAWN))
-      rarch_console_exec(g_settings.libretro);
+   rarch_console_exec(g_settings.libretro);
 #endif
 }
 
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index 0ac9e0088c..e4573c279f 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -464,8 +464,7 @@ static void system_exitspawn(void)
    cellSysmoduleLoadModule(CELL_SYSMODULE_FS);
    cellSysmoduleLoadModule(CELL_SYSMODULE_IO);
 #else
-   if (g_extern.lifecycle_menu_state & (1 << MODE_EXITSPAWN))
-      rarch_console_exec(g_extern.fullpath);
+   rarch_console_exec(g_extern.fullpath);
 #endif
 
 #endif
diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index 6b48294246..df9fdcc5b6 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -391,7 +391,6 @@ static void system_exitspawn(void)
 #ifdef IS_SALAMANDER
    rarch_console_exec(default_paths.libretro_path);
 #else
-   if(g_extern.lifecycle_menu_state & (1 << MODE_EXITSPAWN))
-      rarch_console_exec(g_extern.fullpath);
+   rarch_console_exec(g_extern.fullpath);
 #endif
 }