diff --git a/library/net.c b/library/net.c
index f284153..bfa7072 100644
--- a/library/net.c
+++ b/library/net.c
@@ -444,7 +444,7 @@
     tv.tv_sec  = timeout / 1000;
     tv.tv_usec = ( timeout % 1000 ) * 1000;
 
-    ret = select( fd + 1, &read_fds, NULL, NULL, &tv );
+    ret = select( fd + 1, &read_fds, NULL, NULL, timeout == 0 ? NULL : &tv );
 
     /* Zero fds ready means we timed out */
     if( ret == 0 )