Avoid race condition on entry custom data

PLAT-820 #time 2h