diff --git a/stratosphere/pm/source/impl/pm_process_manager.cpp b/stratosphere/pm/source/impl/pm_process_manager.cpp
index fecb1236a..c732b72bf 100644
--- a/stratosphere/pm/source/impl/pm_process_manager.cpp
+++ b/stratosphere/pm/source/impl/pm_process_manager.cpp
@@ -412,12 +412,12 @@ namespace ams::pm::impl {
                     }
                     break;
                 case ProcessState_Exited:
+                    /* Free process resources, unlink from waitable manager. */
+                    process_info->Cleanup();
+
                     if (hos::GetVersion() < hos::Version_500 && process_info->ShouldSignalOnExit()) {
                         g_process_event.Signal();
                     } else {
-                        /* Free process resources, unlink from waitable manager. */
-                        process_info->Cleanup();
-
                         /* Handle the case where we need to keep the process alive some time longer. */
                         if (hos::GetVersion() >= hos::Version_500 && process_info->ShouldSignalOnExit()) {
                             /* Remove from the living list. */
@@ -436,6 +436,7 @@ namespace ams::pm::impl {
                             CleanupProcessInfo(list, process_info);
                         }
                     }
+                    break;
                 case ProcessState_DebugSuspended:
                     if (process_info->ShouldSignalOnDebugEvent()) {
                         process_info->SetSuspended();