diff --git a/library/timing.c b/library/timing.c
index 5d8b25b..4ec4bf4 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -310,6 +310,12 @@
     mbedtls_timing_alarmed = 0;
     signal( SIGALRM, sighandler );
     alarm( seconds );
+    if( seconds == 0 )
+    {
+        /* alarm(0) cancelled any previous pending alarm, but the
+           handler won't fire, so raise the flag straight away. */
+        mbedtls_timing_alarmed = 1;
+    }
 }
 
 #endif /* _WIN32 && !EFIX64 && !EFI32 */