A fix for this was introduced into the nightly within the last couple of weeks (IGN-9324): Nightly 8.1 Changelogs - 2024 - #60 by system
I recommend trying out the nightly to confirm it is indeed fixed for you. That fix will be officially released within 8.1.40.