diff --git a/CHANGES.md b/CHANGES.md
index de52836b..5de98507 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Bugfix:
  - Edited message: link confusion when (edited) appears in body (#398)
  - Close detail room screen when the room is left with another client (#256)
  - Clear notification for a room left on another client
+ - Fix messages with empty `in_reply_to` not rendering (#447)
 
 Translations:
  -
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
index bd32a75a..c116c6b3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
@@ -29,5 +29,5 @@ interface MessageContent {
 
 
 fun MessageContent?.isReply(): Boolean {
-    return this?.relatesTo?.inReplyTo != null
-}
\ No newline at end of file
+    return this?.relatesTo?.inReplyTo?.eventId != null
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt
index 3df8a534..9ed629ac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt
@@ -21,5 +21,5 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class ReplyToContent(
-        @Json(name = "event_id") val eventId: String
-)
\ No newline at end of file
+        @Json(name = "event_id") val eventId: String? = null
+)