diff --git a/include/stratosphere/waitable_manager.hpp b/include/stratosphere/waitable_manager.hpp
index 70eee2f3..0fb8fe9e 100644
--- a/include/stratosphere/waitable_manager.hpp
+++ b/include/stratosphere/waitable_manager.hpp
@@ -161,7 +161,8 @@ class WaitableManager : public SessionManagerBase {
                         }
                         break;
                     } else {
-                        svcExitThread();
+                        /* Return, this will cause thread to exit. */
+                        return;
                     }
                 }
                 if (w) {