diff --git a/os/WaitFor.c b/os/WaitFor.c
index fa6a99b18e3a6c1844d9a7ff5807991d7d470754..7c7b1d2d41846708497fc62fdfd2f39a17e227e6 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -193,10 +193,9 @@ WaitForSomething(Bool are_ready)
             are_ready = clients_are_ready();
         }
 
+        timeout = check_timers();
         if (are_ready)
             timeout = 0;
-        else
-            timeout = check_timers();
 
         BlockHandler(&timeout);
         if (NewOutputPending)