diff --git a/appinfo/info.xml b/appinfo/info.xml
index e32120fc688ecbf87a66e4a6dbd852213e67aa18..90509703e4d1d9442483b964ecc3c07e9f517590 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@
     <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.
     It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.
     This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>
-    <version>9.0.0</version>
+    <version>8.0.2</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index a6f4e9c600aa8f858b24f0d7a090d6c9d01a6db6..ae455434f3f306905250b97465873817a2bd2a8b 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -89,7 +89,9 @@ class Application extends App implements IBootstrap {
 	 * @return StorageWrapper|IStorage
 	 */
 	public function addStorageWrapperCallback($mountPoint, IStorage $storage) {
-		if (!\OC::$CLI && $mountPoint !== '/') {
+		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
+		$appdataFolder = 'appdata_' . $instanceId;
+		if (!\OC::$CLI && $mountPoint !== '/' && strpos($mountPoint, '/' . $appdataFolder) !== 0) {
 			return new StorageWrapper([
 				'storage' => $storage,
 				'mountPoint' => $mountPoint,