diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py
index c761fe56..79a848bf 100644
--- a/node-daemon/pvcd/Daemon.py
+++ b/node-daemon/pvcd/Daemon.py
@@ -472,12 +472,12 @@ zk_conn.add_listener(zk_listener)
 def cleanup():
     global zk_conn, update_timer, d_domains
 
-    # Set stop state in Zookeeper
-    zkhandler.writedata(zk_conn, { '/nodes/{}/daemonstate'.format(myhostname): 'shutdown' })
-
     logger.out('Performing final keepalive update', state='s')
     update_zookeeper()
 
+    # Set shutdown state in Zookeeper
+    zkhandler.writedata(zk_conn, { '/nodes/{}/daemonstate'.format(myhostname): 'shutdown' })
+
     logger.out('Terminating pvcd and cleaning up', state='s')
 
     # Stop keepalive thread