diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index 9e8d9fd9e4..bf50206a73 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -983,7 +983,7 @@ class FederatedShareProvider implements IShareProvider {
 		}
 
 		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('share_with', 'file_source', 'file_target')
+		$qb->select('share_with', 'token', 'file_source', 'file_target')
 			->from('share')
 			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_REMOTE)))
 			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
@@ -998,6 +998,7 @@ class FederatedShareProvider implements IShareProvider {
 			$remote[$row['share_with']] = [
 				'node_id' => $row['file_source'],
 				'node_path' => $row['file_target'],
+				'token' => $row['token'],
 			];
 		}
 		$cursor->closeCursor();
diff --git a/lib/private/Encryption/File.php b/lib/private/Encryption/File.php
index a1fd8e300d..f6fd3382cb 100644
--- a/lib/private/Encryption/File.php
+++ b/lib/private/Encryption/File.php
@@ -94,7 +94,7 @@ class File implements \OCP\Encryption\IFile {
 			$resultForParents = $this->shareManager->getAccessList($parentNode);
 			$this->cache[$parent] = $resultForParents;
 		}
-		$userIds = \array_merge($userIds, $resultForParents['users']);
+		$userIds = array_merge($userIds, $resultForParents['users']);
 		$public = $resultForParents['public'] || !empty($resultForParents['remote']);