diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index 3f6001cab7423..87cbbec581376 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -587,6 +587,9 @@ protected function getOwner($path) {
 	 * @since 9.1.0
 	 */
 	public function isReadyForUser($user) {
+		if ($this->util->isMasterKeyEnabled()) {
+			return true;
+		}
 		return $this->keyManager->userHasKeys($user);
 	}