From 1b76dcf58722e9c43e8f2138ef66e3f615baa5d9 Mon Sep 17 00:00:00 2001
From: Serhii Petrychenko <s.petrychenko@gmail.com>
Date: Sat, 8 Sep 2018 14:59:10 +0000
Subject: [PATCH] #16298 - Update fix fo the issue

---
 .../Magento/Framework/App/Config/ScopeCodeResolver.php        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
index 0cb0489fba83c..f3699716650d8 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -47,9 +47,6 @@ public function resolve($scopeType, $scopeCode = null)
         ) {
             $scopeResolver = $this->scopeResolverPool->get($scopeType);
             $resolverScopeCode = $scopeResolver->getScope($scopeCode);
-            if ($scopeCode === null) {
-                $scopeCode = $resolverScopeCode->getCode();
-            }
         } else {
             $resolverScopeCode = $scopeCode;
         }
@@ -58,6 +55,7 @@ public function resolve($scopeType, $scopeCode = null)
             $resolverScopeCode = $resolverScopeCode->getCode();
         }
 
+        $scopeCode = $scopeCode === null ? $resolverScopeCode : $scopeCode;
         $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;
         return $resolverScopeCode;
     }