diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 2269663b21..4ae6ae4783 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -115,8 +115,13 @@ class EncryptAll extends Command {
 		if ($this->questionHelper->ask($input, $output, $question)) {
 			$this->forceSingleUserAndTrashbin();
 
-			$defaultModule = $this->encryptionManager->getEncryptionModule();
-			$defaultModule->encryptAll($input, $output);
+			try {
+				$defaultModule = $this->encryptionManager->getEncryptionModule();
+				$defaultModule->encryptAll($input, $output);
+			} catch (\Exception $ex) {
+				$this->resetSingleUserAndTrashbin();
+				throw $ex;
+			}
 
 			$this->resetSingleUserAndTrashbin();
 		} else {