diff --git a/gossip/service/gossip_service.go b/gossip/service/gossip_service.go
index 8bcba1ec384..ce5ef2dc77e 100644
--- a/gossip/service/gossip_service.go
+++ b/gossip/service/gossip_service.go
@@ -133,6 +133,7 @@ func InitGossipServiceCustomDeliveryFactory(peerIdentity []byte, endpoint string
 		}
 
 		idMapper := identity.NewIdentityMapper(mcs)
+		idMapper.Put(mcs.GetPKIidOfCert(peerIdentity), peerIdentity)
 
 		gossip := integration.NewGossipComponent(peerIdentity, endpoint, s, secAdv, mcs, idMapper, dialOpts, bootPeers...)
 		gossipServiceInstance = &gossipServiceImpl{