Agreed!
This was the magic sauce that fixed it for us too:
https://github.com/discourse/discourse/pull/13173
Thanks @jbrw