diff --git a/src/yggdrasil/peer.go b/src/yggdrasil/peer.go
index 22db88d..8c38c06 100644
--- a/src/yggdrasil/peer.go
+++ b/src/yggdrasil/peer.go
@@ -213,7 +213,7 @@ func (p *peer) linkLoop() {
 		case dinfo = <-p.dinfo:
 		case _ = <-tick.C:
 			if dinfo != nil {
-				p.core.router.insertPeer(nil, dinfo)
+				<-p.SyncExec(func() { p.core.router.insertPeer(p, dinfo) })
 			}
 		}
 	}