Fix race condition
Merge pull request #35 from zendesk/po/instinct-fix

OFFAPPS-327 Fix race condition