Resolve "Friday: Investigate refresh loop fix"

Closes #8570 (closed)

This fix was previously tested in our cookiebot sandbox - repository.

If this breaks something in production please feel free to revert the attempted fix, there should be no negative repercussions.