diff --git a/include/conversation.php b/include/conversation.php
index b74b1f152b..cef0bc0e80 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -899,7 +899,7 @@ function item_photo_menu($item) {
 	$block_link = '';
 	$ignore_link = '';
 
-	if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) {
+	if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self'] && !$item['mention']) {
 		$sub_link = 'javascript:doFollowThread(' . $item['id'] . '); return false;';
 	}
 
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 8c7515e112..48652a0e12 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -76,7 +76,7 @@ class Item
 		'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
 		'wall', 'private', 'starred', 'origin', 'parent-origin', 'title', 'body', 'language',
 		'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
-		'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+		'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'mention',
 		'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
 		'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type',
 		'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network',
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 38efc70078..de7c14f84a 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -314,7 +314,7 @@ function frio_display_item(App $a, &$arr)
 		local_user()
 		&& local_user() == $arr['item']['uid']
 		&& $arr['item']['gravity'] == GRAVITY_PARENT
-		&& !$arr['item']['self'])
+		&& !$arr['item']['self'] && !$arr['item']['mention'])
 	{
 		$followThread = [
 			'menu'   => 'follow_thread',