diff --git a/src/components/ContactSelectionBubble.vue b/src/components/ContactSelectionBubble.vue
index e44386a337e..dd0730a2276 100644
--- a/src/components/ContactSelectionBubble.vue
+++ b/src/components/ContactSelectionBubble.vue
@@ -22,6 +22,7 @@
 <template>
 	<div class="contact-selection-bubble">
 		<AvatarWrapper :id="participant.id"
+			token="new"
 			class="contact-selection-bubble__avatar"
 			:name="participant.label"
 			:source="participant.source"
diff --git a/src/components/LeftSidebar/InvitationHandler.vue b/src/components/LeftSidebar/InvitationHandler.vue
index cadc008337e..35db8e8ebae 100644
--- a/src/components/LeftSidebar/InvitationHandler.vue
+++ b/src/components/LeftSidebar/InvitationHandler.vue
@@ -162,7 +162,7 @@ export default {
 			return {
 				user: {
 					component: Mention,
-					props: { id, name: item.inviterDisplayName, server, token: item.token, type: 'user' }
+					props: { id, name: item.inviterDisplayName, server, token: item.token || 'new', type: 'user' }
 				}
 			}
 		},
diff --git a/src/components/RightSidebar/Participants/Participant.vue b/src/components/RightSidebar/Participants/Participant.vue
index 3c6b4bd6f02..0854eed1330 100644
--- a/src/components/RightSidebar/Participants/Participant.vue
+++ b/src/components/RightSidebar/Participants/Participant.vue
@@ -36,7 +36,7 @@
 		@keydown.enter="handleClick">
 		<!-- Participant's avatar -->
 		<AvatarWrapper :id="computedId"
-			:token="token"
+			:token="isSearched ? 'new' : token"
 			:name="computedName"
 			:source="participant.source || participant.actorType"
 			:disable-menu="isSearched"