diff --git a/records.go b/records.go
index 42d345513..4a544675b 100644
--- a/records.go
+++ b/records.go
@@ -24,8 +24,14 @@ const MaxRecordAge = time.Hour * 36
 func (dht *IpfsDHT) GetPublicKey(ctx context.Context, p peer.ID) (ci.PubKey, error) {
 	log.Debugf("getPublicKey for: %s", p)
 
+	// try extracting from identity.
+	pk := p.ExtractPublicKey()
+	if pk != nil {
+		return pk, nil
+	}
+
 	// check locally.
-	pk := dht.peerstore.PubKey(p)
+	pk = dht.peerstore.PubKey(p)
 	if pk != nil {
 		return pk, nil
 	}