diff --git a/lib/private/server.php b/lib/private/server.php
index da70586307802b6db2258b6ee025bdd695bf22b9..3237ce30ccf2c9d43832cb05307114fe625bd28a 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -255,7 +255,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\Files\Folder
 	 */
 	function getUserFolder() {
-		$dir = '/' . \OCP\User::getUser();
+		$dir = '/' . $this->getUserSession()->getUser()->getUID();
 		$root = $this->getRootFolder();
 		$folder = null;