diff --git a/stashr/server.py b/stashr/server.py
index 690348f..2f1916a 100644
--- a/stashr/server.py
+++ b/stashr/server.py
@@ -89,19 +89,23 @@ class Server:
         app.logger.debug('STARTING SERVER')
         self.define_wsgi()
         self.wsgiserver.serve_forever()
+        if self.restart:
+            app.logger.info('Restarting Server')
+            try:
+                subprocess.check_call([sys.executable, 'start.py'])
+            except subprocess.CalledProcessError as e:
+                print(e)
+
 
     def stop_server(self):
         app.logger.debug('STOPPING SERVER')
         self.wsgiserver.stop()
 
     def restart_server(self, ignored_signum, ignored_frame):
+        self.restart = True
         app.logger.debug('Restarting Server')
         if self.wsgiserver is not None :
             self.wsgiserver.stop()
-        try:
-            subprocess.check_call([sys.executable, 'start.py'])
-        except subprocess.CalledProcessError as e:
-            print(e)
 
 
 server = Server()