diff --git a/SickBeard.py b/SickBeard.py
index 204fff63..1e943be0 100755
--- a/SickBeard.py
+++ b/SickBeard.py
@@ -482,8 +482,12 @@ class SickRage(object):
 
             # shutdown web server
             if self.webserver:
+                logger.log("Shutting down Tornado")
                 self.webserver.shutDown()
-                self.webserver = None
+                try:
+                    self.webserver.join(10)
+                except:
+                    pass
 
             # if run as daemon delete the pidfile
             if self.runAsDaemon and self.CREATEPID:
diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py
index edd48a81..567ce865 100644
--- a/sickbeard/webserveInit.py
+++ b/sickbeard/webserveInit.py
@@ -150,7 +150,5 @@ class SRWebServer(threading.Thread):
     def shutDown(self):
         self.alive = False
         if self.server:
-            logger.log("Shutting down tornado")
             self.server.stop()
-            self.io_loop.stop()
-            self.join()
\ No newline at end of file
+            self.io_loop.stop()
\ No newline at end of file