[QE-1022] Addressing race condition