diff --git a/p2p/peer/peerstore.go b/p2p/peer/peerstore.go
index 540987b44..8be502ca4 100644
--- a/p2p/peer/peerstore.go
+++ b/p2p/peer/peerstore.go
@@ -62,9 +62,10 @@ func (e *expiringAddr) Expired() bool {
 type addressMap map[string]expiringAddr
 
 type addressbook struct {
+	sync.RWMutex // guards all fields
+
 	addrs map[ID]addressMap
 	ttl   time.Duration // initial ttl
-	sync.RWMutex
 }
 
 func newAddressbook() *addressbook {