diff --git a/squinnondation/peers.py b/squinnondation/peers.py
index c537e9f..90c2a54 100644
--- a/squinnondation/peers.py
+++ b/squinnondation/peers.py
@@ -943,6 +943,8 @@ class User(Peer):
             if other_peer.id == peer.id > 0 and other_peer != peer:
                 # The peer with the same id is known as a different address. We merge everything
                 peer.merge(other_peer)
+                for other_addr in peer.addresses:
+                    self.neighbours[other_addr] = peer
                 
         self.data_lock.release()