diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 8e5df8b1e..78be870b4 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -109,7 +109,7 @@ const ChatMessage = {
         return this.message.in_reply_to_screen_name
       } else {
         const user = this.$store.getters.findUser(
-          this.status.in_reply_to_user_id,
+          this.message.in_reply_to_user_id,
         )
         return user && user.screen_name_ui
       }
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index 62818d23e..b772a9b20 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -218,7 +218,7 @@
             </div>
           </div>
           <div
-            v-if="repliedTo"
+            v-if="isStatus && repliedTo"
             class="reply-indicator"
           >
             <FAIcon class="icon" icon="reply" />