diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 2c4991e71..e314aa145 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -75,7 +75,7 @@ class Url
         }
 
         $url = new Url();
-        $url->setPath($request->getPathInfo());
+        $url->setPath(ltrim($request->getPathInfo(), '/'));
 
         // $urlParams = UrlParams::fromQueryString($request->getQuery());
         if (isset($_SERVER['QUERY_STRING'])) {
@@ -240,7 +240,7 @@ class Url
      */
     public function setPath($path)
     {
-        $this->path = ltrim($path, '/');
+        $this->path = $path;
         return $this;
     }