I think that should fix it:
https://github.com/discourse/discourse/pull/10701
Awaiting review on our side.