chore: Port forward of #7910

Description

Completes the partial fix of #7657

[ ] I have opened this pull request against develop-4
[ ] I have added or modified the tests when changing logic
[ ] I have followed the conventional commits guidelines to add meaningful information into the changelog
[ ] I have read the contribution guidelines and I have joined the channel #pr-reviews on our Discord Server to find a “pr review buddy” who is going to review my pull request.