OFFAPPS-327 Fix race condition

:koala:

Confirmed working by our support

/cc @zendesk/quokka

### Reference
- [JIRA OFFAPPS-327](https://zendesk.atlassian.net/browse/OFFAPPS-327)

### Risks
- N/A