Sync happening twice

Jira Issue: WP-1251