diff --git a/zuul/cmd/server.py b/zuul/cmd/server.py
index 75f7dd9..4b49be2 100755
--- a/zuul/cmd/server.py
+++ b/zuul/cmd/server.py
@@ -103,8 +103,9 @@
 
     def exit_handler(self, signum, frame):
         signal.signal(signal.SIGUSR1, signal.SIG_IGN)
-        self.stop_gear_server()
         self.sched.exit()
+        self.sched.join()
+        self.stop_gear_server()
 
     def term_handler(self, signum, frame):
         self.stop_gear_server()