Address performance issue on reset
[#76880724]