diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml
index db3d7705..055c2488 100644
--- a/.github/workflows/lint-php-cs.yml
+++ b/.github/workflows/lint-php-cs.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up php
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: 8.1
           coverage: none
@@ -43,7 +43,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        run: composer i
+        run: |
+          composer i
+          composer i
 
       - name: Lint
         run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index 384a92ce..498e8580 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -46,7 +46,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index c2ce7566..66f1ffc3 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -70,7 +70,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 5fa84f5d..795c566d 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -73,7 +73,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 1a1c1f8a..c9a4bafe 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -63,7 +63,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index fe4d9fac..0e2806d4 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up php
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
diff --git a/lib/Hooks/FileListener.php b/lib/Hooks/FileListener.php
index a7a663be..fa38c56b 100644
--- a/lib/Hooks/FileListener.php
+++ b/lib/Hooks/FileListener.php
@@ -20,7 +20,6 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Cache\CacheEntryInsertedEvent;
-use OCP\Files\Config\IUserMountCache;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\BeforeNodeRenamedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
@@ -39,7 +38,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * @psalm-implements IEventListener<Event>
+ * @template-implements IEventListener<Event>
  */
 class FileListener implements IEventListener {
 	private FaceDetectionMapper $faceDetectionMapper;
@@ -49,11 +48,11 @@ class FileListener implements IEventListener {
 	private ?bool $movingFromIgnoredTerritory;
 	private StorageService $storageService;
 	private IManager $shareManager;
-	private IUserMountCache $userMountCache;
 	private IRootFolder $rootFolder;
-	private array $nodeCache;
+	/** @var list<string> */
+	private array $sourceUserIds;
 
-	public function __construct(FaceDetectionMapper $faceDetectionMapper, LoggerInterface $logger, QueueService $queue, IgnoreService $ignoreService, StorageService $storageService, IManager $shareManager, IUserMountCache $userMountCache, IRootFolder $rootFolder) {
+	public function __construct(FaceDetectionMapper $faceDetectionMapper, LoggerInterface $logger, QueueService $queue, IgnoreService $ignoreService, StorageService $storageService, IManager $shareManager, IRootFolder $rootFolder) {
 		$this->faceDetectionMapper = $faceDetectionMapper;
 		$this->logger = $logger;
 		$this->queue = $queue;
@@ -61,27 +60,39 @@ public function __construct(FaceDetectionMapper $faceDetectionMapper, LoggerInte
 		$this->movingFromIgnoredTerritory = null;
 		$this->storageService = $storageService;
 		$this->shareManager = $shareManager;
-		$this->userMountCache = $userMountCache;
 		$this->rootFolder = $rootFolder;
-		$this->nodeCache = [];
+		$this->sourceUserIds = [];
 	}
 
 	public function handle(Event $event): void {
-		if ($event instanceof ShareCreatedEvent) {
-			$share = $event->getShare();
-			$ownerId = $share->getShareOwner();
-			$node = $share->getNode();
+		try {
+			if ($event instanceof ShareCreatedEvent) {
+				$share = $event->getShare();
+				$ownerId = $share->getShareOwner();
+				$node = $share->getNode();
 
-			$accessList = $this->shareManager->getAccessList($node, true, true);
-			$userIds = array_map(fn (int|string $id) => (string)$id, array_keys($accessList['users']));
+				/** @var array{users:array<string,array{node_id:int, node_path: string}>, remote: array<string,array{node_id:int, node_path: string}>, mail: array<string,array{node_id:int, node_path: string}>} $accessList */
+				$accessList = $this->shareManager->getAccessList($node, true, true);
+				$userIds = array_map(fn ($id) => strval($id), array_keys($accessList['users']));
 
-			if ($node->getType() === FileInfo::TYPE_FOLDER) {
-				$mount = $node->getMountPoint();
-				if ($mount->getNumericStorageId() === null) {
-					return;
-				}
-				$files = $this->storageService->getFilesInMount($mount->getNumericStorageId(), $node->getId(), [ClusteringFaceClassifier::MODEL_NAME], 0, 0);
-				foreach ($files as $fileInfo) {
+				if ($node->getType() === FileInfo::TYPE_FOLDER) {
+					$mount = $node->getMountPoint();
+					if ($mount->getNumericStorageId() === null) {
+						return;
+					}
+					$files = $this->storageService->getFilesInMount($mount->getNumericStorageId(), $node->getId(), [ClusteringFaceClassifier::MODEL_NAME], 0, 0);
+					foreach ($files as $fileInfo) {
+						foreach ($userIds as $userId) {
+							if ($userId === $ownerId) {
+								continue;
+							}
+							if (count($this->faceDetectionMapper->findByFileIdAndUser($node->getId(), $userId)) > 0) {
+								continue;
+							}
+							$this->faceDetectionMapper->copyDetectionsForFileFromUserToUser($fileInfo['fileid'], $ownerId, $userId);
+						}
+					}
+				} else {
 					foreach ($userIds as $userId) {
 						if ($userId === $ownerId) {
 							continue;
@@ -89,130 +100,137 @@ public function handle(Event $event): void {
 						if (count($this->faceDetectionMapper->findByFileIdAndUser($node->getId(), $userId)) > 0) {
 							continue;
 						}
-						$this->faceDetectionMapper->copyDetectionsForFileFromUserToUser($fileInfo['fileid'], $ownerId, $userId);
+						$this->faceDetectionMapper->copyDetectionsForFileFromUserToUser($node->getId(), $ownerId, $userId);
 					}
 				}
-			} else {
-				foreach ($userIds as $userId) {
-					if ($userId === $ownerId) {
-						continue;
+			}
+			if ($event instanceof ShareDeletedEvent) {
+				$share = $event->getShare();
+				$node = $share->getNode();
+
+				/** @var array{users:array<string,array{node_id:int, node_path: string}>, remote: array<string,array{node_id:int, node_path: string}>, mail: array<string,array{node_id:int, node_path: string}>} $accessList */
+				$accessList = $this->shareManager->getAccessList($node, true, true);
+				$userIds = array_keys($accessList['users']);
+
+				if ($node->getType() === FileInfo::TYPE_FOLDER) {
+					$mount = $node->getMountPoint();
+					if ($mount->getNumericStorageId() === null) {
+						return;
 					}
-					if (count($this->faceDetectionMapper->findByFileIdAndUser($node->getId(), $userId)) > 0) {
-						continue;
+					$files = $this->storageService->getFilesInMount($mount->getNumericStorageId(), $node->getId(), [ClusteringFaceClassifier::MODEL_NAME], 0, 0);
+					foreach ($files as $fileInfo) {
+						$this->faceDetectionMapper->removeDetectionsForFileFromUsersNotInList($fileInfo['fileid'], $userIds);
 					}
-					$this->faceDetectionMapper->copyDetectionsForFileFromUserToUser($node->getId(), $ownerId, $userId);
+				} else {
+					$this->faceDetectionMapper->removeDetectionsForFileFromUsersNotInList($node->getId(), $userIds);
 				}
 			}
-		}
-		if ($event instanceof ShareDeletedEvent) {
-			$share = $event->getShare();
-			$node = $share->getNode();
-
-			$accessList = $this->shareManager->getAccessList($node, true, true);
-			/**
-			 * @var string[] $userIds
-			 */
-			$userIds = array_keys($accessList['users']);
-
-			if ($node->getType() === FileInfo::TYPE_FOLDER) {
-				$mount = $node->getMountPoint();
-				if ($mount->getNumericStorageId() === null) {
+			if ($event instanceof BeforeNodeRenamedEvent) {
+				if (in_array($event->getSource()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->resetIgnoreCache($event->getSource());
 					return;
 				}
-				$files = $this->storageService->getFilesInMount($mount->getNumericStorageId(), $node->getId(), [ClusteringFaceClassifier::MODEL_NAME], 0, 0);
-				foreach ($files as $fileInfo) {
-					$this->faceDetectionMapper->removeDetectionsForFileFromUsersNotInList($fileInfo['fileid'], $userIds);
+				// We try to remember whether the source node is in ignored territory
+				// because after moving isIgnored doesn't work anymore :(
+				if ($this->isIgnored($event->getSource())) {
+					$this->movingFromIgnoredTerritory = true;
+				} else {
+					$this->movingFromIgnoredTerritory = false;
 				}
-			} else {
-				$this->faceDetectionMapper->removeDetectionsForFileFromUsersNotInList($node->getId(), $userIds);
-			}
-		}
-		if ($event instanceof BeforeNodeRenamedEvent) {
-			if (in_array($event->getSource()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true) &&
-				in_array($event->getTarget()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
-				$this->resetIgnoreCache($event->getSource());
-				return;
-			}
-			// We try to remember whether the source node is in ignored territory
-			// because after moving isIgnored doesn't work anymore :(
-			if ($this->isIgnored($event->getSource())) {
-				$this->movingFromIgnoredTerritory = true;
-			} else {
-				$this->movingFromIgnoredTerritory = false;
-			}
-			return;
-		}
-		if ($event instanceof NodeRenamedEvent) {
-			if (in_array($event->getSource()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true) &&
-				in_array($event->getTarget()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
-				$this->resetIgnoreCache($event->getTarget());
-				$this->postInsert($event->getSource()->getParent());
-				$this->postDelete($event->getTarget()->getParent());
+				/** @var array{users:array<string,array{node_id:int, node_path: string}>, remote: array<string,array{node_id:int, node_path: string}>, mail: array<string,array{node_id:int, node_path: string}>} $sourceAccessList */
+				$sourceAccessList = $this->shareManager->getAccessList($event->getSource(), true, true);
+				$this->sourceUserIds = array_map(fn ($id) => strval($id), array_keys($sourceAccessList['users']));
 				return;
 			}
-			if ($this->movingFromIgnoredTerritory) {
+			if ($event instanceof NodeRenamedEvent) {
+				if (in_array($event->getSource()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true) &&
+					in_array($event->getTarget()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->resetIgnoreCache($event->getTarget());
+					$this->postInsert($event->getSource()->getParent());
+					$this->postDelete($event->getTarget()->getParent());
+					return;
+				}
+
+				if (in_array($event->getSource()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true) &&
+					!in_array($event->getTarget()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->postInsert($event->getSource()->getParent());
+					return;
+				}
+
+				if (!in_array($event->getSource()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true) &&
+					in_array($event->getTarget()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->resetIgnoreCache($event->getTarget());
+					$this->postDelete($event->getTarget()->getParent());
+					return;
+				}
+
+				if ($this->movingFromIgnoredTerritory) {
+					if ($this->isIgnored($event->getTarget())) {
+						return;
+					}
+					$this->postInsert($event->getTarget());
+					return;
+				}
 				if ($this->isIgnored($event->getTarget())) {
+					$this->postDelete($event->getTarget());
 					return;
 				}
-				$this->postInsert($event->getTarget());
-				return;
-			}
-			if ($this->isIgnored($event->getTarget())) {
-				$this->postDelete($event->getTarget());
+				$this->postRename($event->getSource(), $event->getTarget());
 				return;
 			}
-			return;
-		}
-		if ($event instanceof BeforeNodeDeletedEvent) {
-			$this->postDelete($event->getNode(), false);
-			return;
-		}
-		if ($event instanceof NodeDeletedEvent) {
-			if (in_array($event->getNode()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
-				$this->resetIgnoreCache($event->getNode());
-				$this->postInsert($event->getNode()->getParent());
+			if ($event instanceof BeforeNodeDeletedEvent) {
+				$this->postDelete($event->getNode(), false);
 				return;
 			}
-		}
-		if ($event instanceof NodeCreatedEvent) {
-			if (in_array($event->getNode()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
-				$this->resetIgnoreCache($event->getNode());
-				$this->postDelete($event->getNode()->getParent());
-				return;
-			}
-			$this->postInsert($event->getNode(), false);
-			return;
-		}
-		if ($event instanceof CacheEntryInsertedEvent) {
-			$node = current($this->rootFolder->getById($event->getFileId()));
-			if ($node === false) {
-				return;
-			}
-			if ($node instanceof Folder) {
-				return;
-			}
-			if (in_array($node->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
-				$this->resetIgnoreCache($node);
-				$this->postDelete($node->getParent());
-				return;
+			if ($event instanceof NodeDeletedEvent) {
+				if (in_array($event->getNode()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->resetIgnoreCache($event->getNode());
+					$this->postInsert($event->getNode()->getParent());
+					return;
+				}
 			}
-			$this->postInsert($node);
-		}
-		if ($event instanceof NodeRemovedFromCache) {
-			$cacheEntry = $event->getStorage()->getCache()->get($event->getPath());
-			if ($cacheEntry === false) {
+			if ($event instanceof NodeCreatedEvent) {
+				if (in_array($event->getNode()->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->resetIgnoreCache($event->getNode());
+					$this->postDelete($event->getNode()->getParent());
+					return;
+				}
+				$this->postInsert($event->getNode(), false);
 				return;
 			}
-			$node = current($this->rootFolder->getById($cacheEntry->getId()));
-			if ($node === false) {
-				return;
+			if ($event instanceof CacheEntryInsertedEvent) {
+				$node = current($this->rootFolder->getById($event->getFileId()));
+				if ($node === false) {
+					return;
+				}
+				if ($node instanceof Folder) {
+					return;
+				}
+				if (in_array($node->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->resetIgnoreCache($node);
+					$this->postDelete($node->getParent());
+					return;
+				}
+				$this->postInsert($node);
 			}
-			if (in_array($node->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
-				$this->resetIgnoreCache($node);
-				$this->postInsert($node->getParent());
-				return;
+			if ($event instanceof NodeRemovedFromCache) {
+				$cacheEntry = $event->getStorage()->getCache()->get($event->getPath());
+				if ($cacheEntry === false) {
+					return;
+				}
+				$node = current($this->rootFolder->getById($cacheEntry->getId()));
+				if ($node === false) {
+					return;
+				}
+				if (in_array($node->getName(), [...Constants::IGNORE_MARKERS_ALL, ...Constants::IGNORE_MARKERS_IMAGE, ...Constants::IGNORE_MARKERS_AUDIO, ...Constants::IGNORE_MARKERS_VIDEO], true)) {
+					$this->resetIgnoreCache($node);
+					$this->postInsert($node->getParent());
+					return;
+				}
+				$this->postDelete($node);
 			}
-			$this->postDelete($node);
+		} catch (\Throwable $e) {
+			$this->logger->error('Error in recognize file listener', ['exception' => $e]);
 		}
 	}
 
@@ -315,6 +333,43 @@ public function postInsert(Node $node, bool $recurse = true): void {
 		}
 	}
 
+	public function postRename(Node $source, Node $target): void {
+		/** @var array{users:array<string,array{node_id:int, node_path: string}>, remote: array<string,array{node_id:int, node_path: string}>, mail: array<string,array{node_id:int, node_path: string}>} $targetAccessList */
+		$targetAccessList = $this->shareManager->getAccessList($target, true, true);
+		$targetUserIds = array_map(fn ($id) => strval($id), array_keys($targetAccessList['users']));
+
+		$usersToAdd = array_diff($targetUserIds, $this->sourceUserIds);
+		$existingUsers = array_diff($targetUserIds, $usersToAdd);
+		// *handwaving* I know this is a stretch but it's good enough
+		$ownerId = $existingUsers[0];
+
+		if ($target->getType() === FileInfo::TYPE_FOLDER) {
+			$mount = $target->getMountPoint();
+			$numericStorageId = $mount->getNumericStorageId();
+			if ($numericStorageId === null) {
+				return;
+			}
+			$files = $this->storageService->getFilesInMount($numericStorageId, $target->getId(), [ClusteringFaceClassifier::MODEL_NAME], 0, 0);
+			foreach ($files as $fileInfo) {
+				foreach ($usersToAdd as $userId) {
+					if (count($this->faceDetectionMapper->findByFileIdAndUser($target->getId(), $userId)) > 0) {
+						continue;
+					}
+					$this->faceDetectionMapper->copyDetectionsForFileFromUserToUser($fileInfo['fileid'], $ownerId, $userId);
+				}
+				$this->faceDetectionMapper->removeDetectionsForFileFromUsersNotInList($fileInfo['fileid'], $targetUserIds);
+			}
+		} else {
+			foreach ($usersToAdd as $userId) {
+				if (count($this->faceDetectionMapper->findByFileIdAndUser($target->getId(), $userId)) > 0) {
+					continue;
+				}
+				$this->faceDetectionMapper->copyDetectionsForFileFromUserToUser($target->getId(), $ownerId, $userId);
+			}
+			$this->faceDetectionMapper->removeDetectionsForFileFromUsersNotInList($source->getId(), $targetUserIds);
+		}
+	}
+
 	/**
 	 * @param \OCP\Files\Node $node
 	 * @return bool
diff --git a/tests/ClassifierTest.php b/tests/ClassifierTest.php
index 75082842..b80c101a 100644
--- a/tests/ClassifierTest.php
+++ b/tests/ClassifierTest.php
@@ -32,6 +32,7 @@
  */
 class ClassifierTest extends TestCase {
 	public const TEST_USER1 = 'test-user1';
+	public const TEST_USER2 = 'test-user2';
 
 	public const TEST_FILES = ['alpine.jpg' ,'eiffeltower.jpg', 'Rock_Rejam.mp3', 'jumpingjack.gif', 'test'];
 	public const ALL_MODELS = [
@@ -58,11 +59,13 @@ class ClassifierTest extends TestCase {
 	private FaceDetectionMapper $faceDetectionMapper;
 	private IJobList $jobList;
 	private IAppConfig $config;
+	private \OCP\Share\IManager $shareManager;
 
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 		$backend = new \Test\Util\User\Dummy();
 		$backend->createUser(self::TEST_USER1, self::TEST_USER1);
+		$backend->createUser(self::TEST_USER2, self::TEST_USER2);
 		\OC::$server->get(\OCP\IUserManager::class)->registerBackend($backend);
 	}
 
@@ -79,6 +82,7 @@ public function setUp(): void {
 		$this->jobList = \OC::$server->get(IJobList::class);
 		$this->config = \OC::$server->getRegisteredAppContainer('recognize')->get(IAppConfig::class);
 		$this->queue = \OC::$server->get(QueueService::class);
+		$this->shareManager = \OC::$server->get(\OCP\Share\IManager::class);
 		foreach (self::TEST_FILES as $filename) {
 			try {
 				$this->userFolder->get($filename)->delete();
@@ -483,6 +487,26 @@ public function testFacesPipeline() : void {
 				}
 			}
 		}
+
+		// Test FileListener for moving files across share boundaries
+
+		self::assertCount(0, $this->faceDetectionMapper->findByUserId(self::TEST_USER2), 'user 2 should have no face detections');
+
+		$sharedFolder = $this->userFolder->newFolder('/shared/');
+		$share = $this->shareManager->newShare();
+		$share->setSharedBy(self::TEST_USER1);
+		$share->setSharedWith(self::TEST_USER2);
+		$share->setShareType(\OCP\Share\IShare::TYPE_USER);
+		$share->setNode($sharedFolder);
+		$share->setPermissions(\OCP\Constants::PERMISSION_ALL);
+		$this->shareManager->createShare($share);
+		$this->shareManager->acceptShare($share, self::TEST_USER2);
+
+		$testFiles[0]->move($sharedFolder->getPath().'/'.$testFiles[0]->getName());
+
+		self::assertCount(1, $this->faceDetectionMapper->findByUserId(self::TEST_USER2), 'user 2 should have 1 face detection now');
+		$this->shareManager->deleteShare($share);
+		self::assertCount(0, $this->faceDetectionMapper->findByUserId(self::TEST_USER2), 'user 2 should have 0 face detections after deleting the share');
 	}
 
 	/**