Looks like one of the #Forgejo bugs I reported has a fix in-flight already, excited for it to land. Already cherry-picked that to my instance and was able to verify that it works well.

codeberg.org/forgejo/forgejo/p