diff --git a/lib/KD2/WebDAV/Server.php b/lib/KD2/WebDAV/Server.php
index 4c16a4f..4530a36 100644
--- a/lib/KD2/WebDAV/Server.php
+++ b/lib/KD2/WebDAV/Server.php
@@ -118,7 +118,8 @@ class Server
 
 	public function setBaseURI(string $uri): void
 	{
-		$this->base_uri = rtrim($uri, '/') . '/';
+		$this->base_uri = '/' . ltrim($this->base_uri);
+		$this->base_uri = rtrim($this->base_uri, '/') . '/';
 	}
 
 	/**
@@ -1243,8 +1244,9 @@ class Server
 		$uri = parse_url($source, PHP_URL_PATH);
 		$uri = rawurldecode($uri);
 		$uri = trim($uri, '/');
+		$uri = '/' . $uri;
 
-		if ($uri . '/' == $this->base_uri) {
+		if ($uri . '/' === $this->base_uri) {
 			$uri .= '/';
 		}