diff --git a/Include/Aurora/Threading/Waitables/FutexSemaphoreWaitable.hpp b/Include/Aurora/Threading/Waitables/FutexSemaphoreWaitable.hpp
index 95247007..fd48b6e0 100644
--- a/Include/Aurora/Threading/Waitables/FutexSemaphoreWaitable.hpp
+++ b/Include/Aurora/Threading/Waitables/FutexSemaphoreWaitable.hpp
@@ -111,7 +111,7 @@ namespace Aurora::Threading::Waitables
                 return true;
             }
 
-            auto qwEndTime = Time::SteadyClockNS() + qwTimeout;
+            auto qwEndTime = qwTimeout ? Time::SteadyClockNS() + qwTimeout : 0;
 
             if (TryLock())
             {