Attached is a patch that seems to do what you want.  Are you able to try
this?

I'm sure there's a better way to do this but at least this seems to
work.

-- 
: Eric S Fraga, with org release_9.5.4-720-g4db67d in Emacs 29.0.50