[stable2409]: Backport #5688 (#5727)

As requested here:
https://github.com/paritytech/polkadot-sdk/pull/5688#issuecomment-2352939516

I don't think it need to be backported to 2407, as the issue was not
present there yet.