[HVA-10537] fixing the defer use