diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
index a66f6569f1..bb7dfcfb6d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
@@ -7,5 +7,6 @@ import com.squareup.moshi.JsonClass
 data class UnsignedData(
         @Json(name = "age") val age: Long?,
         @Json(name = "redacted_because") val redactedEvent: Event? = null,
-        @Json(name = "transaction_id") val transactionId: String? = null
+        @Json(name = "transaction_id") val transactionId: String? = null,
+        @Json(name = "prev_content") val prevContent: Map<String, Any>? = null
 )
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
index d52eb5ef33..e90798b603 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
@@ -17,7 +17,8 @@ object EventMapper {
         val eventEntity = EventEntity()
         eventEntity.eventId = event.eventId ?: ""
         eventEntity.content = adapter.toJson(event.content)
-        eventEntity.prevContent = adapter.toJson(event.prevContent)
+        val resolvedPrevContent = event.prevContent ?: event.unsignedData?.prevContent
+        eventEntity.prevContent = adapter.toJson(resolvedPrevContent)
         eventEntity.stateKey = event.stateKey
         eventEntity.type = event.type
         eventEntity.sender = event.sender