update code

Author: rogerdz

app/code/Magento/Catalog/Controller/Product/Compare/Index.php

@@ -78,11 +78,14 @@ public function execute()
     {
         $beforeUrl = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED);
         if ($beforeUrl) {
-            $this->_catalogSession->setBeforeCompareUrl(
-                $this->urlDecoder->decode($beforeUrl)
-            );
-        } else {
-            $this->_catalogSession->unsBeforeCompareUrl();
+            $beforeUrl = $this->urlDecoder->decode($beforeUrl);
+            if(strpos((string)$beforeUrl, "customer/section/load") == 0){
+                $this->_catalogSession->setBeforeCompareUrl(
+                    $beforeUrl
+                );
+            } else {
+                $this->_catalogSession->unsBeforeCompareUrl();
+            }
         }
         return $this->resultPageFactory->create();
     }

app/code/Magento/Catalog/CustomerData/CompareProducts.php

@@ -73,7 +73,7 @@ public function getSectionData()
         return [
             'count' => $count,
             'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
-            'listUrl' => $this->helper->getListUrl(false),
+            'listUrl' => $this->helper->getListUrl(),
             'items' => $count ? $this->getItems() : [],
             'websiteId' => $this->storeManager->getWebsite()->getId()
         ];

app/code/Magento/Catalog/Helper/Product/Compare.php

@@ -142,13 +142,12 @@ public function __construct(
     /**
      * Retrieve compare list url
      *
-     * @param bool $encodedUrl
      * @return string
      */
-    public function getListUrl($encodedUrl = true)
+    public function getListUrl()
     {
         $params = [
-            \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl ? $this->getEncodedUrl() : ''
+            \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()
         ];
         return $this->_getUrl('catalog/product_compare', $params);
     }