We ran into this issue as well when working on a client project and created a solution detailed in the video below.
If you check out the tutorial you’ll get walked through the issue as well as implementing the solution from start to finish.
Please feel free to tag me if you have any questions!
Happy Thursday!