diff --git a/Plugin/App/Request/StorePathInfoValidator.php b/Plugin/App/Request/StorePathInfoValidator.php
index 9975780..6efb337 100644
--- a/Plugin/App/Request/StorePathInfoValidator.php
+++ b/Plugin/App/Request/StorePathInfoValidator.php
@@ -34,9 +34,10 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string
             if ($uri !== false) {
                 if ($pathInfo === '') {
                     $pathInfo = parse_url($uri, PHP_URL_PATH);
-                    if ($pathInfo !== false) {
-                        $pathInfo = strtok($pathInfo, '/');
+                    if ($pathInfo === false) {
+                        return [$request, $pathInfo];
                     }
+                    $pathInfo = strtok($pathInfo, '/');
                 }
                 $pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri);
             }