diff --git a/src/components/messages/messageMixin.js b/src/components/messages/messageMixin.js
index 0afe3fa..bb1af52 100644
--- a/src/components/messages/messageMixin.js
+++ b/src/components/messages/messageMixin.js
@@ -50,8 +50,10 @@ export default {
       const originalEventId = relatesTo['m.in_reply_to'].event_id;
       if (originalEventId && this.timelineSet) {
         const originalEvent = this.timelineSet.findEventById(originalEventId);
-        this.inReplyToEvent = originalEvent;
-        this.inReplyToSender = this.messageEventDisplayName(originalEvent);
+        if (originalEvent) {
+          this.inReplyToEvent = originalEvent;
+          this.inReplyToSender = this.messageEventDisplayName(originalEvent);
+        }
       }
     }
   },