Issue 35838: Customer is logged in but showing 404 error in frontend

Author: Roger

app/code/Magento/Customer/Model/Url.php

@@ -126,8 +126,10 @@ public function getLoginUrlParams()
             && !$this->customerSession->getNoReferer()
             && $this->request->isGet()
         ) {
-            $referer = $this->urlBuilder->getUrl('*/*/*', ['_current' => true, '_use_rewrite' => true]);
-            $referer = $this->urlEncoder->encode($referer);
+            $refererUrl = $this->urlBuilder->getUrl('*/*/*', ['_current' => true, '_use_rewrite' => true]);
+            if(!$this->isNoRouteUrl($refererUrl)) {
+                $referer = $this->urlEncoder->encode($refererUrl);
+            }
         }
 
         if ($referer) {
@@ -256,4 +258,17 @@ private function getRequestReferrer()
         }
         return null;
     }
+
+    private function isNoRouteUrl($url)
+    {
+        $defaultNoRouteUrl = $this->scopeConfig->getValue(
+            'web/default/no_route',
+            ScopeInterface::SCOPE_STORE
+        );
+        $noRouteUrl = $this->urlBuilder->getUrl($defaultNoRouteUrl);
+        if (strpos($url, $noRouteUrl) !== false) {
+            return true;
+        };
+        return false;
+    }
 }