diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index eadd8a93fafe60abb188e66d6c58773e6956a2b2..d60d430d77cb76da949ad7d8e712170d93d453f0 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -222,7 +222,10 @@ class Filesystem {
 			return false;
 		}
 		self::$defaultInstance = new View($root);
-		self::$mounts = new Mount\Manager();
+
+		if(!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
 
 		//load custom mount config
 		self::initMountPoints($user);