[OE-3215] race condition bugfix