diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index b5770d0582..7549745e7d 100644
--- a/lib/files/cache/backgroundwatcher.php
+++ b/lib/files/cache/backgroundwatcher.php
@@ -30,7 +30,7 @@ class BackgroundWatcher {
 			return;
 		}
 		list($storageId, $internalPath) = $cacheItem;
-		$mounts = Mount\Manager::findByStorageId($storageId);
+		$mounts = Mount::findByStorageId($storageId);
 
 		if (count($mounts) === 0) {
 			//if the storage we need isn't mounted on default, try to find a user that has access to the storage
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d0cac9dc1d..d60d430d77 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -236,9 +236,7 @@ class Filesystem {
 	}
 
 	static public function initMounts(){
-		if(!self::$mounts) {
-			self::$mounts = new Mount\Manager();
-		}
+		self::$mounts = new Mount\Manager();
 	}
 
 	/**