diff --git a/lib/private/Collaboration/Collaborators/LookupPlugin.php b/lib/private/Collaboration/Collaborators/LookupPlugin.php
index 3a6a094377..6355500de0 100644
--- a/lib/private/Collaboration/Collaborators/LookupPlugin.php
+++ b/lib/private/Collaboration/Collaborators/LookupPlugin.php
@@ -27,8 +27,10 @@ namespace OC\Collaboration\Collaborators;
 use OCP\Collaboration\Collaborators\ISearchPlugin;
 use OCP\Collaboration\Collaborators\ISearchResult;
 use OCP\Collaboration\Collaborators\SearchResultType;
+use OCP\Federation\ICloudIdManager;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
+use OCP\IUserSession;
 use OCP\Share;
 
 class LookupPlugin implements ISearchPlugin {
@@ -37,14 +39,27 @@ class LookupPlugin implements ISearchPlugin {
 	private $config;
 	/** @var IClientService */
 	private $clientService;
+	/** @var string remote part of the current user's cloud id */
+	private $currentUserRemote;
+	/** @var ICloudIdManager */
+	private $cloudIdManager;
 
-	public function __construct(IConfig $config, IClientService $clientService) {
+	public function __construct(IConfig $config,
+								IClientService $clientService,
+								IUserSession $userSession,
+								ICloudIdManager $cloudIdManager) {
 		$this->config = $config;
 		$this->clientService = $clientService;
+		$this->cloudIdManager = $cloudIdManager;
+		$currentUserCloudId = $userSession->getUser()->getCloudId();
+		$this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
 	}
 
 	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		if ($this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') !== 'yes') {
+		$isGlobalScaleEnabled = $this->config->getSystemValue('gs.enabled', false);
+		$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
+		// if case of Global Scale we always search the lookup server
+		if ($isLookupServerEnabled !== 'yes' && !$isGlobalScaleEnabled) {
 			return false;
 		}
 
@@ -65,8 +80,12 @@ class LookupPlugin implements ISearchPlugin {
 			$body = json_decode($response->getBody(), true);
 
 			foreach ($body as $lookup) {
+				$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
+				if ($this->currentUserRemote === $remote) continue;
+				$name = $lookup['name']['value'];
+				$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
 				$result[] = [
-					'label' => $lookup['federationId'],
+					'label' => $label,
 					'value' => [
 						'shareType' => Share::SHARE_TYPE_REMOTE,
 						'shareWith' => $lookup['federationId'],