diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 708f5335a5..044740d3c7 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -252,24 +252,26 @@ class Diaspora
 	 * One of the parameters is a contact array.
 	 * This is done to avoid duplicates.
 	 *
-	 * @param array $parent   The parent post
+	 * @param array $item     Item that is about to be delivered
 	 * @param array $contacts The previously fetched contacts
 	 *
 	 * @return array of relay servers
 	 * @throws \Exception
 	 */
-	public static function participantsForThread(array $parent, array $contacts)
+	public static function participantsForThread(array $item, array $contacts)
 	{
-		if (!in_array($parent['private'], [Item::PUBLIC, Item::UNLISTED])) {
+		if (!in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]) || in_array($item["verb"], [Activity::FOLLOW, Activity::TAG])) {
 			return $contacts;
 		}
 
-		$items = Item::select(['author-id'], ['parent' => $parent['id']], ['group_by' => ['author-id']]);
+		$items = Item::select(['author-id', 'author-link', 'parent-author-link', 'parent-guid'],
+			['parent' => $item['parent'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
 		while ($item = DBA::fetch($items)) {
 			$contact = DBA::selectFirst('contact', ['id', 'url', 'name', 'protocol', 'batch', 'network'],
 				['id' => $item['author-id']]);
-			if (!DBA::isResult($contact)) {
-				// Shouldn't happen
+			if (!DBA::isResult($contact) || empty($contact['batch']) ||
+				($contact['network'] != Protocol::DIASPORA) ||
+				Strings::compareLink($item['parent-author-link'], $item['author-link'])) {
 				continue;
 			}
 
@@ -281,7 +283,7 @@ class Diaspora
 			}
 
 			if (!$exists) {
-				Logger::info('Add participant to receiver list', ['item' => $parent['guid'], 'participant' => $contact['url']]);
+				Logger::info('Add participant to receiver list', ['parent' => $item['parent-guid'], 'item' => $item['guid'], 'participant' => $contact['url']]);
 				$contacts[] = $contact;
 			}
 		}
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 34a4cdc023..07bb99df20 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -437,7 +437,7 @@ class Notifier
 
 				// Fetch the participation list
 				// The function will ensure that there are no duplicates
-				$relay_list = Diaspora::participantsForThread($parent, $relay_list);
+				$relay_list = Diaspora::participantsForThread($target_item, $relay_list);
 
 				// Add the relay to the list, avoid duplicates.
 				// Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly.