@loic merged a fix for this issue, let us know how it goes for you please.
https://github.com/discourse/discourse/pull/18865