diff --git a/src/Util/BasePath.php b/src/Util/BasePath.php
index 1df92ea69c..4811239295 100644
--- a/src/Util/BasePath.php
+++ b/src/Util/BasePath.php
@@ -43,7 +43,7 @@ class BasePath
 	}
 
 	/**
-	 * Returns the base filesystem path of the App
+	 * Returns the base Friendica filesystem path without trailing slash
 	 *
 	 * It first checks for the internal variable, then for DOCUMENT_ROOT and
 	 * finally for PWD
@@ -71,7 +71,7 @@ class BasePath
 			throw new \Exception(sprintf('\'%s\' is not a valid basepath', $baseDir));
 		}
 
-		return $baseDir;
+		return rtrim($baseDir, '/');
 	}
 
 	/**