diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index c58bebd331..fc9cc7a29d 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -68,6 +68,7 @@
     max-height: 200px;
     max-width: 100%;
     display: flex;
+    align-items: center;
     video {
       max-width: 100%;
     }
diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue
index c023857014..343ef52982 100644
--- a/src/components/avatar_list/avatar_list.vue
+++ b/src/components/avatar_list/avatar_list.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="avatars">
-    <router-link :to="userProfileLink(user)" class="avatars-item" v-for="user in slicedUsers">
+    <router-link
+      :to="userProfileLink(user)"
+      class="avatars-item"
+      v-for="user in slicedUsers"
+      :key="user.id"
+    >
       <UserAvatar :user="user" class="avatar-small" />
     </router-link>
   </div>
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index b307459096..8ae89421b8 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -139,6 +139,7 @@ const conversation = {
       return (this.isExpanded) && id === this.status.id
     },
     setHighlight (id) {
+      if (!id) return
       this.highlight = id
       this.$store.dispatch('fetchFavsAndRepeats', id)
     },