This will be fixed via
https://github.com/discourse/discourse/pull/20665#pullrequestreview-1339566167