diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index 13d663b3..d2df9535 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -22,6 +22,11 @@
         @click.prevent="onClick"
       >
         <!-- eslint-disable vue/no-v-html -->
+        <UserAvatar
+          v-if="shouldShowAvatar"
+          class="mention-avatar"
+          :user="user"
+        />
         <span class="shortName">@<span
           class="userName"
           v-html="userName"