diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 044740d3c7..708b6597ef 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2327,9 +2327,9 @@ class Diaspora
 		Logger::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]);
 
 		// Send all existing comments and likes to the requesting server
-		$comments = Item::select(['id', 'uri-id', 'parent'], ['parent' => $parent_item['id']]);
+		$comments = Item::select(['id', 'uri-id', 'parent', 'verb'], ['parent' => $parent_item['id']]);
 		while ($comment = Item::fetch($comments)) {
-			if ($comment['id'] == $comment['parent']) {
+			if ($comment['id'] == $comment['parent'] || in_array($comment["verb"], [Activity::FOLLOW, Activity::TAG])) {
 				continue;
 			}