We're aware of this issue and working on a fix. We're hoping to have it ready by the v9.10 update but will keep you posted.
devtrackers.gg