From 3bb857f8d60e45a40931bb99085c7d8f841ce922 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Wed, 16 Dec 2020 14:44:52 +0200
Subject: [PATCH] MC-39765: No such entity with addressId, occurs randomly on
 visitors browser. System Log Generated

---
 .../Magento/Persistent/Observer/EmulateCustomerObserver.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php b/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
index 0b978b9822345..c991836a287d2 100644
--- a/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
+++ b/app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
@@ -103,7 +103,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             }
 
             if ($defaultBilling = $customer->getDefaultBilling()) {
-                $address = $this->getCustomerAddressById($defaultShipping);
+                $address = $this->getCustomerAddressById($defaultBilling);
 
                 if ($address !== null) {
                     $this->_customerSession->setDefaultTaxBillingAddress([