Add condition to avoid many useless update
This refs affinitic #5617