diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index 6d388624e48..83f1b1182e3 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -127,7 +127,7 @@ class Encryption implements IEncryptionModule {
 		/* If useLegacyFileKey is not specified in header, auto-detect, to be safe */
 		$useLegacyFileKey = (($header['useLegacyFileKey'] ?? '') == 'false' ? false : null);
 
-		$this->fileKey = $this->keyManager->getFileKey($this->path, $this->user, $useLegacyFileKey, $this->session->decryptAllModeActivated());
+		$this->fileKey = $this->keyManager->getFileKey($this->path, null, $useLegacyFileKey, $this->session->decryptAllModeActivated());
 
 		// always use the version from the original file, also part files
 		// need to have a correct version number if they get moved over to the
@@ -322,7 +322,7 @@ class Encryption implements IEncryptionModule {
 	 * update encrypted file, e.g. give additional users access to the file
 	 *
 	 * @param string $path path to the file which should be updated
-	 * @param string $uid of the user who performs the operation
+	 * @param string $uid ignored
 	 * @param array $accessList who has access to the file contains the key 'users' and 'public'
 	 * @return bool
 	 */
@@ -335,7 +335,7 @@ class Encryption implements IEncryptionModule {
 			return false;
 		}
 
-		$fileKey = $this->keyManager->getFileKey($path, $uid, null);
+		$fileKey = $this->keyManager->getFileKey($path, null, null);
 
 		if (!empty($fileKey)) {
 			$publicKeys = [];
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index f9c1ef94634..429190d3698 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -23,7 +23,7 @@ class KeyManager {
 	private string $recoveryKeyId;
 	private string $publicShareKeyId;
 	private string $masterKeyId;
-	private string $keyId;
+	private ?string $keyUid;
 	private string $publicKeyId = 'publicKey';
 	private string $privateKeyId = 'privateKey';
 	private string $shareKeyId = 'shareKey';
@@ -62,7 +62,7 @@ class KeyManager {
 			$this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId);
 		}
 
-		$this->keyId = $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
+		$this->keyUid = $userSession->isLoggedIn() ? $userSession->getUser()?->getUID() : null;
 	}
 
 	/**
@@ -345,13 +345,11 @@ class KeyManager {
 	}
 
 	/**
+	 * @param ?string $uid deprecated
 	 * @param ?bool $useLegacyFileKey null means try both
 	 */
 	public function getFileKey(string $path, ?string $uid, ?bool $useLegacyFileKey, bool $useDecryptAll = false): string {
-		if ($uid === '') {
-			$uid = null;
-		}
-		$publicAccess = is_null($uid);
+		$publicAccess = ($this->keyUid === null);
 		$encryptedFileKey = '';
 		if ($useLegacyFileKey ?? true) {
 			$encryptedFileKey = $this->keyStorage->getFileKey($path, $this->fileKeyId, Encryption::ID);
@@ -380,6 +378,7 @@ class KeyManager {
 			$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.' . $this->privateKeyId, Encryption::ID);
 			$privateKey = $this->crypt->decryptPrivateKey($privateKey);
 		} else {
+			$uid = $this->keyUid;
 			$shareKey = $this->getShareKey($path, $uid);
 			$privateKey = $this->session->getPrivateKey();
 		}
diff --git a/lib/private/Encryption/EncryptionEventListener.php b/lib/private/Encryption/EncryptionEventListener.php
index d51b4b0d531..4560c4796df 100644
--- a/lib/private/Encryption/EncryptionEventListener.php
+++ b/lib/private/Encryption/EncryptionEventListener.php
@@ -67,21 +67,16 @@ class EncryptionEventListener implements IEventListener {
 	}
 
 	private function getUpdate(?IUser $owner = null): Update {
-		if (is_null($this->updater)) {
-			$user = $this->userSession->getUser();
-			if (!$user && ($owner !== null)) {
-				$user = $owner;
-			}
-			if (!$user) {
-				throw new \Exception('Inconsistent data, File unshared, but owner not found. Should not happen');
-			}
-
-			$uid = $user->getUID();
-
+		$user = $this->userSession->getUser();
+		if (!$user && ($owner !== null)) {
+			$user = $owner;
+		}
+		if ($user) {
 			if (!$this->setupManager->isSetupComplete($user)) {
 				$this->setupManager->setupForUser($user);
 			}
-
+		}
+		if (is_null($this->updater)) {
 			$this->updater = new Update(
 				new Util(
 					new View(),
@@ -91,7 +86,6 @@ class EncryptionEventListener implements IEventListener {
 				\OC::$server->getEncryptionManager(),
 				\OC::$server->get(IFile::class),
 				\OC::$server->get(LoggerInterface::class),
-				$uid
 			);
 		}
 
diff --git a/lib/private/Encryption/Update.php b/lib/private/Encryption/Update.php
index 293a1ce653c..fb54e640be5 100644
--- a/lib/private/Encryption/Update.php
+++ b/lib/private/Encryption/Update.php
@@ -27,7 +27,6 @@ class Update {
 		protected Manager $encryptionManager,
 		protected File $file,
 		protected LoggerInterface $logger,
-		protected string $uid,
 	) {
 	}
 
@@ -108,10 +107,10 @@ class Update {
 		foreach ($allFiles as $file) {
 			$usersSharing = $this->file->getAccessList($file);
 			try {
-				$encryptionModule->update($file, $this->uid, $usersSharing);
+				$encryptionModule->update($file, '', $usersSharing);
 			} catch (GenericEncryptionException $e) {
 				// If the update of an individual file fails e.g. due to a corrupt key we should continue the operation and just log the failure
-				$this->logger->error('Failed to update encryption module for ' . $this->uid . ' ' . $file, [ 'exception' => $e ]);
+				$this->logger->error('Failed to update encryption module for ' . $file, [ 'exception' => $e ]);
 			}
 		}
 	}