diff --git a/Include/Aurora/Threading/WaitFor.hpp b/Include/Aurora/Threading/WaitFor.hpp
index c9dc98eb..446b3174 100644
--- a/Include/Aurora/Threading/WaitFor.hpp
+++ b/Include/Aurora/Threading/WaitFor.hpp
@@ -53,6 +53,6 @@ namespace Aurora::Threading
     /// @deprecated
     static inline bool WaitFor(IWaitable *pWaitable, AuUInt64 uTimeoutMS)
     {
-        return WaitForAbsNS(pWaitable, AuMSToNS<AuUInt64>(uTimeoutMS) + Time::SteadyClockNS());
+        return WaitForAbsNS(pWaitable, uTimeoutMS ? AuMSToNS<AuUInt64>(uTimeoutMS) + Time::SteadyClockNS() : 0);
     }
 }
\ No newline at end of file