diff --git a/protocol/communities_events_utils_test.go b/protocol/communities_events_utils_test.go
index 425d1f766..2cf458e59 100644
--- a/protocol/communities_events_utils_test.go
+++ b/protocol/communities_events_utils_test.go
@@ -2361,7 +2361,7 @@ func testPrivilegedMemberAcceptsRequestToJoinAfterMemberLeave(base CommunityEven
 
 	// check event sender received member leave update from ControlNode
 	_, err = WaitOnMessengerResponse(
-		base.GetControlNode(),
+		base.GetEventSender(),
 		checkMemberLeave,
 		"event sender did not receive member leave update",
 	)
diff --git a/protocol/messenger_community_shard.go b/protocol/messenger_community_shard.go
index 16e764eb7..e23de4d6c 100644
--- a/protocol/messenger_community_shard.go
+++ b/protocol/messenger_community_shard.go
@@ -19,12 +19,8 @@ import (
 )
 
 func (m *Messenger) sendPublicCommunityShardInfo(community *communities.Community) error {
-	if m.transport.WakuVersion() != 2 {
-		return nil
-	}
-
 	if !community.IsControlNode() {
-		return nil
+		return communities.ErrNotControlNode
 	}
 
 	publicShardInfo := &protobuf.PublicShardInfo{