Hopefully this will fix the issue without introducing new ones
https://github.com/discourse/discourse/pull/40224