diff --git a/couchpotato/core/_base/_core.py b/couchpotato/core/_base/_core.py
index 1ca7d878..ca45ceb0 100644
--- a/couchpotato/core/_base/_core.py
+++ b/couchpotato/core/_base/_core.py
@@ -90,7 +90,11 @@ class Core(Plugin):
 
         def shutdown():
             self.initShutdown()
-        IOLoop.current().add_callback(shutdown)
+
+        if IOLoop.current()._closing:
+            shutdown()
+        else:
+            IOLoop.current().add_callback(shutdown)
 
         return 'shutdown'
 
@@ -139,7 +143,8 @@ class Core(Plugin):
         log.debug('Safe to shutdown/restart')
 
         try:
-            IOLoop.current().stop()
+            if not IOLoop.current()._closing:
+                IOLoop.current().stop()
         except RuntimeError:
             pass
         except:
diff --git a/couchpotato/core/database.py b/couchpotato/core/database.py
index 532befae..881b81e1 100644
--- a/couchpotato/core/database.py
+++ b/couchpotato/core/database.py
@@ -28,6 +28,7 @@ class Database(object):
 
         addEvent('database.setup_index', self.setupIndex)
         addEvent('app.migrate', self.migrate)
+        addEvent('app.after_shutdown', self.close)
 
     def getDB(self):
 
@@ -37,6 +38,9 @@ class Database(object):
 
         return self.db
 
+    def close(self, **kwargs):
+        self.getDB().close()
+
     def setupIndex(self, index_name, klass):
 
         self.indexes.append(index_name)
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index dcdac5c8..1684eddb 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -262,8 +262,14 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
 
     # Go go go!
     from tornado.ioloop import IOLoop
+    from tornado.autoreload import add_reload_hook
     loop = IOLoop.current()
 
+    # Reload hook
+    def test():
+        fireEvent('app.shutdown')
+    add_reload_hook(test)
+
     # Some logging and fire load event
     try: log.info('Starting server on port %(port)s', config)
     except: pass