diff --git a/core/register_command.php b/core/register_command.php
index d9e5dfcd775eb..3357853b82ce8 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -48,6 +48,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+
+use OCP\Encryption\IManager as IEncryptionManager;
 use Psr\Log\LoggerInterface;
 
 $application->add(new \Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand());
@@ -121,16 +123,16 @@
 	}
 
 	$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
+	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->get(IEncryptionManager::class)));
+	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->get(IEncryptionManager::class), \OC::$server->getConfig()));
+	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->get(IEncryptionManager::class), \OC::$server->getConfig()));
+	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->get(IEncryptionManager::class)));
+	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->get(IEncryptionManager::class), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
 	$application->add(new OC\Core\Command\Encryption\DecryptAll(
-		\OC::$server->getEncryptionManager(),
+		\OC::$server->get(IEncryptionManager::class),
 		\OC::$server->getAppManager(),
 		\OC::$server->getConfig(),
-		new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
+		new \OC\Encryption\DecryptAll(\OC::$server->get(IEncryptionManager::class), \OC::$server->getUserManager(), new \OC\Files\View()),
 		new \Symfony\Component\Console\Helper\QuestionHelper())
 	);
 
diff --git a/lib/private/Encryption/HookManager.php b/lib/private/Encryption/HookManager.php
index 5081bcccf948d..fc51f398231cf 100644
--- a/lib/private/Encryption/HookManager.php
+++ b/lib/private/Encryption/HookManager.php
@@ -26,6 +26,7 @@
 use OC\Files\Filesystem;
 use OC\Files\View;
 use OC\Files\SetupManager;
+use OCP\Encryption\IManager as IEncryptionManager;
 use Psr\Log\LoggerInterface;
 
 class HookManager {
@@ -78,7 +79,7 @@ private static function getUpdate(?string $owner = null): Update {
 					\OC::$server->getGroupManager(),
 					\OC::$server->getConfig()),
 				Filesystem::getMountManager(),
-				\OC::$server->getEncryptionManager(),
+				\OC::$server->get(IEncryptionManager::class),
 				\OC::$server->getEncryptionFilesHelper(),
 				\OC::$server->get(LoggerInterface::class),
 				$uid
diff --git a/tests/lib/Traits/EncryptionTrait.php b/tests/lib/Traits/EncryptionTrait.php
index 23f188ccd6673..26af6c9fedf6f 100644
--- a/tests/lib/Traits/EncryptionTrait.php
+++ b/tests/lib/Traits/EncryptionTrait.php
@@ -14,7 +14,7 @@
 use OCA\Encryption\AppInfo\Application;
 use OCA\Encryption\KeyManager;
 use OCA\Encryption\Users\Setup;
-use OCP\Encryption\IManager;
+use OCP\Encryption\IManager as IEncryptionManager;
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 
@@ -74,7 +74,7 @@ protected function setupForUser($name, $password) {
 		/** @var Setup $userSetup */
 		$userSetup = $container->query(Setup::class);
 		$userSetup->setupUser($name, $password);
-		$encryptionManager = $container->query(IManager::class);
+		$encryptionManager = $container->query(IEncryptionManager::class);
 		$this->encryptionApp->setUp($encryptionManager);
 		$keyManager->init($name, $password);
 	}
@@ -82,7 +82,7 @@ protected function setupForUser($name, $password) {
 	protected function postLogin() {
 		$encryptionWrapper = new EncryptionWrapper(
 			new ArrayCache(),
-			\OC::$server->getEncryptionManager(),
+			\OC::$server->get(IEncryptionManager::class),
 			\OC::$server->get(LoggerInterface::class)
 		);
 
@@ -90,7 +90,7 @@ protected function postLogin() {
 	}
 
 	protected function setUpEncryptionTrait() {
-		$isReady = \OC::$server->getEncryptionManager()->isReady();
+		$isReady = \OC::$server->get(IEncryptionManager::class)->isReady();
 		if (!$isReady) {
 			$this->markTestSkipped('Encryption not ready');
 		}
@@ -107,7 +107,7 @@ protected function setUpEncryptionTrait() {
 		$this->originalEncryptionModule = $this->config->getAppValue('core', 'default_encryption_module');
 		$this->config->setAppValue('core', 'default_encryption_module', \OCA\Encryption\Crypto\Encryption::ID);
 		$this->config->setAppValue('core', 'encryption_enabled', 'yes');
-		$this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
+		$this->assertTrue(\OC::$server->get(IEncryptionManager::class)->isEnabled());
 	}
 
 	protected function tearDownEncryptionTrait() {