diff --git a/lib/base.php b/lib/base.php
index 44395be627..a5ca08123a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -703,24 +703,8 @@ class OC {
 	private static function registerEncryptionWrapper() {
 		$enabled = self::$server->getEncryptionManager()->isEnabled();
 		if ($enabled) {
-			\OC\Files\Filesystem::addStorageWrapper('oc_encryption', function ($mountPoint, $storage, \OCP\Files\Mount\IMountPoint $mount) {
-
-				$parameters = [
-					'storage' => $storage,
-					'mountPoint' => $mountPoint,
-					'mount' => $mount];
-				$manager = \OC::$server->getEncryptionManager();
-				$util = new \OC\Encryption\Util(
-					new \OC\Files\View(),
-					\OC::$server->getUserManager(),
-					\OC::$server->getConfig());
-				$user = \OC::$server->getUserSession()->getUser();
-				$logger = \OC::$server->getLogger();
-				$uid = $user ? $user->getUID() : null;
-				return new \OC\Files\Storage\Wrapper\Encryption($parameters, $manager, $util, $logger, $uid);
-			});
+			\OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC\Encryption\Manager', 'setupStorage');
 		}
-
 	}
 
 	private static function registerEncryptionHooks() {
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index 7cd49d1c0e..bf411ea95e 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -23,7 +23,9 @@
 
 namespace OC\Encryption;
 
+use OC\Files\Storage\Wrapper\Encryption;
 use OCP\Encryption\IEncryptionModule;
+use OCP\Files\Mount\IMountPoint;
 
 class Manager implements \OCP\Encryption\IManager {
 
@@ -181,5 +183,21 @@ class Manager implements \OCP\Encryption\IManager {
 		}
 	}
 
-
+	public static function setupStorage() {
+		\OC\Files\Filesystem::addStorageWrapper('oc_encryption', function ($mountPoint, $storage, IMountPoint $mount) {
+			$parameters = [
+				'storage' => $storage,
+				'mountPoint' => $mountPoint,
+				'mount' => $mount];
+			$manager = \OC::$server->getEncryptionManager();
+			$util = new \OC\Encryption\Util(
+				new \OC\Files\View(),
+				\OC::$server->getUserManager(),
+				\OC::$server->getConfig());
+			$user = \OC::$server->getUserSession()->getUser();
+			$logger = \OC::$server->getLogger();
+			$uid = $user ? $user->getUID() : null;
+			return new Encryption($parameters, $manager, $util, $logger, $uid);
+		});
+	}
 }