I just pushed this:
https://github.com/discourse/discourse/commit/7290765a6202ae217865962a1a5d45725b6a642b
It seems to fix the issue. It’s not the fancy patch I had in mind but should be good enough for now and give me more time to work on a non hacky solution.