diff --git a/src/sync-core.cc b/src/sync-core.cc
index 164296a..a0d7573 100644
--- a/src/sync-core.cc
+++ b/src/sync-core.cc
@@ -117,6 +117,10 @@
   m_log->UpdateDeviceSeqNo(m_userName, seqno);
   // choose to update locator everytime
   m_log->UpdateLocator(m_userName, m_localPrefix);
+  {
+    WriteLock lock(m_ypMutex);
+    m_yp[m_userName] = m_localPrefix;
+  }
   HashPtr oldHash = m_rootHash;
   m_rootHash = m_log->RememberStateInStateLog();