diff --git a/command.c b/command.c
index beabb1c5d5..40d4dc1075 100644
--- a/command.c
+++ b/command.c
@@ -2032,19 +2032,19 @@ bool command_event(enum event_command cmd, void *data)
          }
          break;
       case CMD_EVENT_QUIT_RETROARCH:
-         rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
+         rarch_ctl(RARCH_CTL_QUIT, NULL);
          break;
       case CMD_EVENT_SHUTDOWN:
 #if defined(__linux__) && !defined(ANDROID)
          runloop_msg_queue_push("Shutting down...", 1, 180, true);
-         rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
+         rarch_ctl(RARCH_CTL_QUIT, NULL);
          system("shutdown -P now");
 #endif
          break;
       case CMD_EVENT_REBOOT:
 #if defined(__linux__) && !defined(ANDROID)
          runloop_msg_queue_push("Rebooting...", 1, 180, true);
-         rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
+         rarch_ctl(RARCH_CTL_QUIT, NULL);
          system("shutdown -r now");
 #endif
          break;
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index 6e5d43edee..a4e070e30b 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -426,7 +426,7 @@ static bool frontend_gx_set_fork(enum frontend_fork fork_mode)
       case FRONTEND_FORK_RESTART:
          RARCH_LOG("FRONTEND_FORK_RESTART\n");
          gx_fork_mode  = fork_mode;
-         rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
+         command_event(CMD_EVENT_QUIT_RETROARCH, NULL);
          break;
       case FRONTEND_FORK_NONE:
       default:
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 592ed1e242..9f0ea43639 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -1827,7 +1827,7 @@ static bool frontend_linux_set_fork(enum frontend_fork fork_mode)
             fill_pathname_application_path(executable_path, sizeof(executable_path));
             strlcpy(settings->path.libretro, executable_path, sizeof(settings->path.libretro));
          }
-         rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
+         command_event(CMD_EVENT_QUIT_RETROARCH, NULL);
          break;
       case FRONTEND_FORK_NONE:
       default:
diff --git a/retroarch.c b/retroarch.c
index 85f46f4072..dbf803e32b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1529,9 +1529,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
          rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
          break;
-      case RARCH_CTL_FORCE_QUIT:
-         rarch_ctl(RARCH_CTL_QUIT, NULL);
-         break;
       case RARCH_CTL_VALIDATE_CPU_FEATURES:
          {
             uint64_t cpu = cpu_features_get();
diff --git a/retroarch.h b/retroarch.h
index 7b5e9bb023..f7f4196350 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -91,8 +91,6 @@ enum rarch_ctl_state
 
    RARCH_CTL_QUIT,
 
-   RARCH_CTL_FORCE_QUIT,
-
    /* Validates CPU features for given processor architecture.
     * Make sure we haven't compiled for something we cannot run.
     * Ideally, code would get swapped out depending on CPU support,