This is now fixed via:
https://github.com/discourse/discourse/commit/e9c5e17fbe3e4d7730d523778d254c1c1d9bc181
and
https://github.com/discourse/discourse/commit/130dbf7358272da5c902e2e9afb8dfadcdd7497c