diff --git a/App/Request/PathInfoProcessor.php b/App/Request/PathInfoProcessor.php
new file mode 100644
index 0000000..4af1aca
--- /dev/null
+++ b/App/Request/PathInfoProcessor.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © OpenGento, All rights reserved.
+ */
+declare(strict_types=1);
+
+namespace Opengento\StorePathUrl\App\Request;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Router\Base;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\App\Request\PathInfoProcessor as AppPathInfoProcessor;
+use Magento\Store\App\Request\StorePathInfoValidator;
+use Opengento\StorePathUrl\Service\PathResolver;
+
+use function str_starts_with;
+use function strlen;
+use function substr;
+
+class PathInfoProcessor extends AppPathInfoProcessor
+{
+    public function __construct(
+        private StorePathInfoValidator $storePathInfoValidator,
+        private PathResolver $pathResolver,
+        private StoreRepositoryInterface $storeRepository
+    ) {}
+
+    public function process(RequestInterface $request, $pathInfo): string
+    {
+        $storeCode = $this->storePathInfoValidator->getValidStoreCode($request, $pathInfo);
+        if (!empty($storeCode)) {
+            try {
+                $path = $this->pathResolver->resolve($this->storeRepository->getActiveStoreByCode($storeCode));
+            } catch (LocalizedException) {
+                return $pathInfo;
+            }
+            if (!$request->isDirectAccessFrontendName($path)) {
+                $pathInfo = substr($pathInfo, strlen($path) + (int)str_starts_with($pathInfo, '/')) ?: '/';
+            } else {
+                //no route in case we're trying to access a store that has the same code as a direct access
+                $request->setActionName(Base::NO_ROUTE);
+            }
+        }
+
+        return $pathInfo;
+    }
+}
diff --git a/Plugin/App/Request/PathInfo.php b/Plugin/App/Request/PathInfo.php
deleted file mode 100644
index 7867313..0000000
--- a/Plugin/App/Request/PathInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © OpenGento, All rights reserved.
- */
-declare(strict_types=1);
-
-namespace Opengento\StorePathUrl\Plugin\App\Request;
-
-use Magento\Framework\App\Request\PathInfo as PathInfoSubject;
-use Magento\Framework\App\RequestInterface;
-use Opengento\StorePathUrl\Model\Config;
-use Opengento\StorePathUrl\Service\StorePathFixer;
-
-class PathInfo
-{
-    public function __construct(
-        private Config $config,
-        private StorePathFixer $storePathFixer,
-        private RequestInterface $request
-    ) {}
-
-    public function beforeGetPathInfo(PathInfoSubject $subject, string $requestUri, string $baseUrl): array
-    {
-        if ($this->config->isEnabled()) {
-            $requestUri = $this->storePathFixer->fix($baseUrl ? $requestUri : $this->request->getUriString(), $requestUri);
-        }
-
-        return [$requestUri, $baseUrl];
-    }
-}
diff --git a/Plugin/App/Request/StorePathInfoValidator.php b/Plugin/App/Request/StorePathInfoValidator.php
new file mode 100644
index 0000000..3779c32
--- /dev/null
+++ b/Plugin/App/Request/StorePathInfoValidator.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © OpenGento, All rights reserved.
+ */
+declare(strict_types=1);
+
+namespace Opengento\StorePathUrl\Plugin\App\Request;
+
+use Magento\Framework\App\Request\Http;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\App\Request\StorePathInfoValidator as Subject;
+use Magento\Store\Model\Store;
+use Opengento\StorePathUrl\Model\Config;
+
+class StorePathInfoValidator
+{
+    public function __construct(
+        private Config $config,
+        private StoreRepositoryInterface $storeRepository
+    ) {}
+
+    public function beforeGetValidStoreCode(Subject $subject, Http $request, string $pathInfo = ''): array
+    {
+        if ($this->config->isEnabled()) {
+            $uri = $request->getUriString();
+            /** @var Store $store */
+            foreach ($this->storeRepository->getList() as $store) {
+                if ($store->getId() && str_starts_with($uri, $store->getBaseUrl())) {
+                    $pathInfo = $store->getCode();
+                }
+            }
+        }
+
+        return [$request, $pathInfo];
+    }
+}
diff --git a/Service/StorePathFixer.php b/Service/StorePathFixer.php
deleted file mode 100644
index fa19757..0000000
--- a/Service/StorePathFixer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright © OpenGento, All rights reserved.
- */
-declare(strict_types=1);
-
-namespace Opengento\StorePathUrl\Service;
-
-use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\Store;
-
-use function str_starts_with;
-
-class StorePathFixer
-{
-    public function __construct(
-        private StoreRepositoryInterface $storeRepository,
-        private UriUtils $uriUtils
-    ) {}
-
-    /**
-     * Replace the request uri path with the store code, if the base url match any of the registered store base url.
-     */
-    public function fix(string $baseUrl, string $requestUri): string
-    {
-        /** @var Store $store */
-        foreach ($this->storeRepository->getList() as $store) {
-            if ($store->getId() && str_starts_with($baseUrl, $store->getBaseUrl())) {
-                return $this->uriUtils->replacePathCode($requestUri, $store);
-            }
-        }
-
-        return $requestUri;
-    }
-}
diff --git a/etc/di.xml b/etc/di.xml
index a0a91a3..743d26d 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -15,10 +15,15 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Backend\App\Request\PathInfoProcessor">
+        <arguments>
+            <argument name="subject" xsi:type="object">Opengento\StorePathUrl\App\Request\PathInfoProcessor</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Url\ScopeInterface">
         <plugin name="Opengento_StorePathUrl::prepend_custom_path" type="Opengento\StorePathUrl\Plugin\Url\Scope"/>
     </type>
-    <type name="Magento\Framework\App\Request\PathInfo">
-        <plugin name="Opengento_StorePathUrl::replace_country_store_code" type="Opengento\StorePathUrl\Plugin\App\Request\PathInfo"/>
+    <type name="Magento\Store\App\Request\StorePathInfoValidator">
+        <plugin name="Opengento_StorePathUrl::resolve_store_code" type="Opengento\StorePathUrl\Plugin\App\Request\StorePathInfoValidator"/>
     </type>
 </config>