Fixes issue where message is sent mulple times

Jira issue: APPPARTY-17