1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
index 446c8c97df0..30f616dd8e1 100644
--- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
@@ -83,9 +83,11 @@ export default {
 
       if (this.user.status.emoji && this.user.status.message_html) {
         return `${glEmojiTag(this.user.status.emoji)} ${this.user.status.message_html}`;
-      } else if (this.user.status.message_html) {
+      }
+      if (this.user.status.message_html) {
         return this.user.status.message_html;
-      } else if (this.user.status.emoji) {
+      }
+      if (this.user.status.emoji) {
         return glEmojiTag(this.user.status.emoji);
       }