ENYO-3042: avoid possible callback issue