diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 3ff71dcdc7..10137bb379 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -491,7 +491,8 @@ private function getToken(File $file, ?IShare $share = null, ?int $version = nul
 				$owneruid,
 				$isGuest,
 				false,
-				$share?->getPermissions()
+				$share?->getPermissions(),
+				$this->userId,
 			);
 			$this->tokenManager->setShareToken($wopiToken, $share?->getToken());
 			return $wopiToken;
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index c2c6ba9d33..cb97a39d73 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -165,8 +165,11 @@ public function generateWopiTokenForTemplate(
 		bool $isGuest,
 		bool $direct = false,
 		?int $sharePermissions = null,
+		?string $editoruid = null,
 	): Wopi {
-		$editoruid = $isGuest ? null : $owneruid;
+		if (empty($editoruid)) {
+			$editoruid = $isGuest ? null : $owneruid;
+		}
 
 		$rootFolder = $this->rootFolder->getUserFolder($owneruid);
 		$targetFile = $rootFolder->getFirstNodeById($targetFileId);