I was able to fix @erlend_sh’s bug with this commit:
https://github.com/discourse/discourse/commit/6c4c542ae37f2cd16049b11aa2e1dcf51e557174
However I could not reproduce yours @strager – is it still happening on the latest build? Do you have steps to reproduce?