diff --git a/gossip/service/gossip_service.go b/gossip/service/gossip_service.go
index c2ce01b4555..68c8e546b20 100644
--- a/gossip/service/gossip_service.go
+++ b/gossip/service/gossip_service.go
@@ -224,13 +224,14 @@ func (g *gossipServiceImpl) configUpdated(config Config) {
 		return
 	}
 	jcm := &joinChannelMessage{seqNum: config.Sequence(), members2AnchorPeers: map[string][]api.AnchorPeer{}}
-	for orgID, appOrg := range config.Organizations() {
+	for _, appOrg := range config.Organizations() {
+		logger.Debug(appOrg.MSPID(), "anchor peers:", appOrg.AnchorPeers())
 		for _, ap := range appOrg.AnchorPeers() {
 			anchorPeer := api.AnchorPeer{
 				Host: ap.Host,
 				Port: int(ap.Port),
 			}
-			jcm.members2AnchorPeers[orgID] = append(jcm.members2AnchorPeers[orgID], anchorPeer)
+			jcm.members2AnchorPeers[appOrg.MSPID()] = append(jcm.members2AnchorPeers[appOrg.MSPID()], anchorPeer)
 		}
 	}
 
@@ -305,8 +306,8 @@ func (g *gossipServiceImpl) onStatusChangeFactory(chainID string, committer bloc
 
 func orgListFromConfig(config Config) []string {
 	var orgList []string
-	for orgName := range config.Organizations() {
-		orgList = append(orgList, orgName)
+	for _, appOrg := range config.Organizations() {
+		orgList = append(orgList, appOrg.MSPID())
 	}
 	return orgList
 }
diff --git a/gossip/service/join_test.go b/gossip/service/join_test.go
index 1b6b8dc6c25..7a92f55a49b 100644
--- a/gossip/service/join_test.go
+++ b/gossip/service/join_test.go
@@ -79,14 +79,15 @@ func (*gossipMock) Stop() {
 }
 
 type appOrgMock struct {
+	id string
 }
 
 func (*appOrgMock) Name() string {
 	panic("implement me")
 }
 
-func (*appOrgMock) MSPID() string {
-	panic("implement me")
+func (ao *appOrgMock) MSPID() string {
+	return ao.id
 }
 
 func (*appOrgMock) AnchorPeers() []*peer.AnchorPeer {
@@ -102,7 +103,7 @@ func (*configMock) ChainID() string {
 
 func (*configMock) Organizations() map[string]config.ApplicationOrg {
 	return map[string]config.ApplicationOrg{
-		"Org0": &appOrgMock{},
+		"Org0": &appOrgMock{"Org0"},
 	}
 }