1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
index 7e091da0e01..e83b7448414 100644
--- a/lib/private/Files/SetupManager.php
+++ b/lib/private/Files/SetupManager.php
@@ -204,8 +204,14 @@ class SetupManager {
 		}
 		$this->setupUsersComplete[] = $user->getUID();
 
+		if (!isset($this->setupUserMountProviders[$user->getUID()])) {
+			$this->setupUserMountProviders[$user->getUID()] = [];
+		}
+
 		$this->setupForUserWith($user, function () use ($user) {
-			$this->mountProviderCollection->addMountForUser($user, $this->mountManager);
+			$this->mountProviderCollection->addMountForUser($user, $this->mountManager, function (IMountProvider $provider) use ($user) {
+				return !in_array(get_class($provider), $this->setupUserMountProviders[$user->getUID()]);
+			});
 		});
 		$this->userFullySetup($user);
 	}