Fixes issue where messages are always broadcasted on the channel

Jira issue: APPPARTY-8