changed logic to avoid multiple datastream updates

Jira ticket EMIC-5