diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index 3f70bd3c1..d2cbf1dd0 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -609,7 +609,7 @@ class Url
                 $urlString .= ':' . $this->getPort();
             }
 
-            return $urlString . '/' . $path;
+            return $urlString . $basePath . ($basePath !== '/' && $path ? '/' : '') . $path;
         } else {
             return $basePath . ($basePath !== '/' && $path ? '/' : '') . $path;
         }