diff --git a/SABnzbd.py b/SABnzbd.py
index 8303e7c..0d2ac14 100755
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -1445,6 +1445,7 @@ def main():
     cherrypy.config.update({'server.environment': 'production',
                             'server.socket_host': cherryhost,
                             'server.socket_port': cherryport,
+                            'server.shutdown_timeout':  0,
                             'log.screen': cherrylogtoscreen,
                             'engine.autoreload.frequency': 100,
                             'engine.autoreload.on': False,
diff --git a/cherrypy/wsgiserver/__init__.py b/cherrypy/wsgiserver/__init__.py
index 0a54bee..ea6084f 100644
--- a/cherrypy/wsgiserver/__init__.py
+++ b/cherrypy/wsgiserver/__init__.py
@@ -1698,7 +1698,7 @@ class ThreadPool(object):
 
         # Don't join currentThread (when stop is called inside a request).
         current = threading.currentThread()
-        if timeout and timeout >= 0:
+        if timeout is not None and timeout >= 0:
             endtime = time.time() + timeout
         while self._threads:
             worker = self._threads.pop()