fix ZK-2022 cause B36-1968616 endless issue