From f0af87edad79b295b4be87f6f92502bacfbc2764 Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Wed, 24 Jan 2018 11:49:02 +0200
Subject: [PATCH] Forwardport of magento/magento2#11460 to 2.3-develop branch

---
 app/code/Magento/Store/App/Request/PathInfoProcessor.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
index 613a6d1998858..0afef45bbc2df 100644
--- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -6,6 +6,7 @@
 namespace Magento\Store\App\Request;
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\Store;
 
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
@@ -42,7 +43,7 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI
         }
 
         if ($store->isUseStoreInUrl()) {
-            if (!$request->isDirectAccessFrontendName($storeCode)) {
+            if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE ) {
                 $this->storeManager->setCurrentStore($store->getCode());
                 $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
                 return $pathInfo;