diff --git a/pvcd.py b/pvcd.py
index 95a22922..14a63fbc 100755
--- a/pvcd.py
+++ b/pvcd.py
@@ -116,10 +116,11 @@ zk.add_listener(zk_listener)
 
 @atexit.register
 def cleanup():
+    update_timer.shutdown()
     zk.set('/nodes/{}/daemonstate'.format(myhostname), 'stop'.encode('ascii'))
     zk.stop()
     zk.close()
-    update_timer.shutdown()
+    exit(0)
 
 # Handle SIGTERM gracefully
 signal.signal(signal.SIGTERM, cleanup)