I think this fixes the bug I was noticing on page load [#73972058]