diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 7e27650c557..434ee495870 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -374,6 +374,9 @@ class Filesystem {
 	 * Returns path like /admin/files
 	 */
 	static public function getRoot() {
+		if (!self::$defaultInstance) {
+			return null;
+		}
 		return self::$defaultInstance->getRoot();
 	}