diff --git a/lib/private/Files/Node/LazyRoot.php b/lib/private/Files/Node/LazyRoot.php
index 317b814465..1fb3f6448b 100644
--- a/lib/private/Files/Node/LazyRoot.php
+++ b/lib/private/Files/Node/LazyRoot.php
@@ -139,7 +139,7 @@ class LazyRoot implements IRootFolder {
 	 * @inheritDoc
 	 */
 	public function get($path) {
-		$this->__call(__FUNCTION__, func_get_args());
+		return $this->__call(__FUNCTION__, func_get_args());
 	}
 
 	/**
diff --git a/lib/private/Server.php b/lib/private/Server.php
index b651285e9a..6f2b5b69bc 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -185,7 +185,7 @@ class Server extends ServerContainer implements IServerContainer {
 		});
 		$this->registerService('LazyRootFolder', function(Server $c) {
 			return new LazyRoot(function() use ($c) {
-				return $c->getRootFolder();
+				return $c->query('RootFolder');
 			});
 		});
 		$this->registerService('UserManager', function (Server $c) {
@@ -838,7 +838,7 @@ class Server extends ServerContainer implements IServerContainer {
 	 * @return \OCP\Files\IRootFolder
 	 */
 	public function getRootFolder() {
-		return $this->query('RootFolder');
+		return $this->query('LazyRootFolder');
 	}
 
 	/**