diff --git a/stratosphere/libstratosphere/include/stratosphere/waitable_manager.hpp b/stratosphere/libstratosphere/include/stratosphere/waitable_manager.hpp
index 4f7c1a5ac..7e116a53d 100644
--- a/stratosphere/libstratosphere/include/stratosphere/waitable_manager.hpp
+++ b/stratosphere/libstratosphere/include/stratosphere/waitable_manager.hpp
@@ -29,8 +29,7 @@
 #include "scope_guard.hpp"
 
 static inline Handle GetCurrentThreadHandle() {
-    /* TODO: Wait for libnx to add a way for me to call getThreadVars() */
-    return *((Handle *)((uintptr_t)armGetTls() + 0x1E4));
+    return threadGetCurHandle();
 }
 
 struct DefaultManagerOptions {