Fix for race condition on load

[#54767046]