Pretty sure this has been fixed by @small-lovely-cat in
https://github.com/discourse/discourse/pull/36953