diff --git a/lib/Folder/FolderManager.php b/lib/Folder/FolderManager.php
index 51291ee21..f046f360c 100644
--- a/lib/Folder/FolderManager.php
+++ b/lib/Folder/FolderManager.php
@@ -130,8 +130,8 @@ private function joinQueryWithFileCache(IQueryBuilder $query, int $rootStorageId
 		$query->leftJoin('f', 'filecache', 'c', $query->expr()->andX(
 			$query->expr()->eq('c.name', $query->expr()->castColumn('f.folder_id', IQueryBuilder::PARAM_STR)),
 			$query->expr()->eq('c.parent', $query->createNamedParameter($this->getGroupFolderRootId($rootStorageId))),
-			$query->expr()->eq('c.storage', $query->createNamedParameter($rootStorageId)),
 		));
+		$query->hintShardKey('c.storage', $rootStorageId);
 	}
 
 	/**