diff --git a/Source/Threading/AuWaitFor.cpp b/Source/Threading/AuWaitFor.cpp
index 676b542c..8533afc6 100644
--- a/Source/Threading/AuWaitFor.cpp
+++ b/Source/Threading/AuWaitFor.cpp
@@ -118,7 +118,8 @@ namespace Aurora::Threading
             qwTimeoutAbs = AuMSToNS<AuUInt64>(uTimeout);
         }
 
-        if (!(uFlags & kWaitForFlagTimeoutIsAbsolute))
+        if ((!(uFlags & kWaitForFlagTimeoutIsAbsolute)) && 
+            (uTimeout))
         {
             qwTimeoutAbs += AuTime::SteadyClockNS();
         }