diff --git a/src/rendezvous_server.rs b/src/rendezvous_server.rs
index bd603c7..46c2142 100644
--- a/src/rendezvous_server.rs
+++ b/src/rendezvous_server.rs
@@ -401,7 +401,9 @@ impl RendezvousServer {
                     let id = rk.id;
                     let mut res = register_pk_response::Result::OK;
                     if let Some(peer) = self.pm.get(&id).await {
-                        if peer.uuid != rk.uuid {
+                        if peer.uuid.is_empty() {
+                            self.pm.update_pk(id, addr, rk.uuid, rk.pk);
+                        } else if peer.uuid != rk.uuid {
                             log::warn!(
                                 "Peer {} uuid mismatch: {:?} vs {:?}",
                                 id,