diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 9000c928d..6096eef88 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -191,11 +191,11 @@ class Url
             $urlPath = $urlParts['path'];
             if ($urlPath && $urlPath[0] === '/') {
                 if ($urlObject->isExternal() || isset($urlParts['user'])) {
-                    $urlPath = substr($urlPath, 1);
+                    $urlPath = ltrim($urlPath, '/');
                 } else {
                     $requestBaseUrl = $request->getBaseUrl();
                     if ($requestBaseUrl && $requestBaseUrl !== '/' && strpos($urlPath, $requestBaseUrl) === 0) {
-                        $urlPath = substr($urlPath, strlen($requestBaseUrl) + 1);
+                        $urlPath = ltrim(substr($urlPath, strlen($requestBaseUrl)), '/');
                         $urlObject->setBasePath($requestBaseUrl);
                     }
                 }