diff --git a/vendor/magento/framework/App/Config/ScopeCodeResolver.php b/vendor/magento/framework/App/Config/ScopeCodeResolver.php
index c6b37b0e3fa6..192e3f32d1d2 100644
--- a/vendor/magento/framework/App/Config/ScopeCodeResolver.php
+++ b/vendor/magento/framework/App/Config/ScopeCodeResolver.php
@@ -40,7 +40,7 @@ public function __construct(ScopeResolverPool $scopeResolverPool)
      */
     public function resolve($scopeType, $scopeCode)
     {
-        if (isset($scopeCode, $this->resolvedScopeCodes[$scopeType][$scopeCode])) {
+        if ($scopeCode !== null && isset($this->resolvedScopeCodes[$scopeType][$scopeCode])) {
             return $this->resolvedScopeCodes[$scopeType][$scopeCode];
         }
 
@@ -56,7 +56,7 @@ public function resolve($scopeType, $scopeCode)
         }
 
         if ($scopeCode === null) {
-            $scopeCode = $resolverScopeCode;
+            return $resolverScopeCode;
         }
 
         $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;