diff --git a/src/Bridge/Symfony/Routing/Router.php b/src/Bridge/Symfony/Routing/Router.php
index 3959a6c39ed..8257f739b5d 100644
--- a/src/Bridge/Symfony/Routing/Router.php
+++ b/src/Bridge/Symfony/Routing/Router.php
@@ -71,7 +71,10 @@ public function getRouteCollection()
     public function match($pathInfo)
     {
         $baseContext = $this->router->getContext();
-        $pathInfo = str_replace($baseContext->getBaseUrl(), '', $pathInfo);
+        $baseURL = $baseContext->getBaseUrl();
+        if (0 === strpos($pathInfo, $baseURL)) {
+            $pathInfo = substr($pathInfo, \strlen($baseURL));
+        }
 
         $request = Request::create($pathInfo, 'GET', [], [], [], ['HTTP_HOST' => $baseContext->getHost()]);
         try {