Merge remote-tracking branch 'origin/MC-36113' into 2.4-develop-pr36

Author: serhii-balko

app/code/Magento/Store/Model/Config/Processor/Fallback.php

@@ -178,20 +178,18 @@ private function getWebsiteConfig(array $websites, $id)
      */
     private function loadScopes(): void
     {
-        $loaded = false;
         try {
             if ($this->deploymentConfig->isDbAvailable()) {
                 $this->storeData = $this->storeResource->readAllStores();
                 $this->websiteData = $this->websiteResource->readAllWebsites();
-                $loaded = true;
+            } else {
+                $this->storeData = $this->scopes->get('stores');
+                $this->websiteData = $this->scopes->get('websites');
             }
         } catch (TableNotFoundException $exception) {
             // database is empty or not setup
-            $loaded = false;
-        }
-        if (!$loaded) {
-            $this->storeData = $this->scopes->get('stores');
-            $this->websiteData = $this->scopes->get('websites');
+            $this->storeData = [];
+            $this->websiteData = [];
         }
     }
 }