diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
index b9006f58e2..58e0498dce 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -238,10 +238,12 @@ class RustMatrixRoom(
         withContext(roomDispatcher) {
             if (originalEventId != null) {
                 runCatching {
-                    innerRoom.edit(
-                        newContent = messageEventContentFromParts(body, htmlBody),
-                        editItem = innerRoom.getEventTimelineItemByEventId(originalEventId.value),
-                    )
+                    innerRoom.getEventTimelineItemByEventId(originalEventId.value).use {
+                        innerRoom.edit(
+                            newContent = messageEventContentFromParts(body, htmlBody),
+                            editItem = it,
+                        )
+                    }
                 }
             } else {
                 runCatching {