diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index fad53469c0..5e83b692db 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -167,7 +167,7 @@ module WEBrick
           while @status == :Running
             begin
               sp = shutdown_pipe[0]
-              if svrs = IO.select([sp, *@listeners], nil, nil, 2.0)
+              if svrs = IO.select([sp, *@listeners])
                 if svrs[0].include? sp
                   # swallow shutdown pipe
                   buf = String.new