Thanks for the detailed description of the issue.
I’ve managed to recreate the problem on my end, and I think this pull request should address the issue you describe
https://github.com/discourse/discourse/pull/13409
Edit: Strange… the tests pass for me locally, but are failing after I push them. I will dig in to that tomorrow.