In SXA Storefront website when navigating to a non-existing page under /shop or /catalog, the redirect goes to a broken page instead of the page referred in the "Page Not Found Link" field.
Apply the following patch to fix the issue: https://github.com/SitecoreSupport/Sitecore.Support.42073.