diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
index 0dbcdf73de1aa1ce703cf6c140795c91cb365fcf..2ef4cf5d6e62c9417403744c6747d0b7f2042517 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
@@ -38,7 +38,7 @@ data class ContentAttachmentData(
         val mimeType: String?,
         val type: Type,
         val waveform: List<Int>? = null,
-        val blurHash: String? = null
+        val thumbHash: String? = null
 ) : Parcelable {
 
     @JsonClass(generateAdapter = false)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
index 380e0fcbc81c0f347ed7f87055a8bb8a4dd41fd7..511f11bbe24686a294d90655fdbaf59e966e7afc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
@@ -60,7 +60,12 @@ data class ImageInfo(
         /**
          * Added to support thumbhash blur MSC2448
          */
-        @Json(name = "blurhash") val blurHash: String? = null
+        @Json(name = "blurhash") val blurHash: String? = null,
+
+        /**
+         * Added to support thumbhash blur MSC2448
+         */
+        @Json(name = "thumbhash") val thumbHash: String? = null
 )
 
 /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
index 23725926f1f4d4242d20f37f27aa8d1f6aa23fc3..bdb0a30556971363689ce2a9ab4decad8a33df7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
@@ -65,7 +65,12 @@ data class VideoInfo(
         /**
          * Added to support thumbhash blur MSC2448
          */
-        @Json(name = "blurhash") val blurHash: String? = null
+        @Json(name = "blurhash") val blurHash: String? = null,
+
+        /**
+         * Added to support thumbhash blur MSC2448
+         */
+        @Json(name = "thumbhash") val thumbHash: String? = null
 )
 
 /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index fbbca9ae3282d5fe144b25b5f45e539eca025027..b80578aeee68b29a83a50694238ae3382aaadf78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -179,7 +179,7 @@ internal class DefaultSendService @AssistedInject constructor(
                             name = messageContent.body,
                             queryUri = Uri.parse(messageContent.url),
                             type = ContentAttachmentData.Type.IMAGE,
-                            blurHash = messageContent.info.blurHash
+                            thumbHash = messageContent.info.thumbHash ?: messageContent.info.blurHash
                     )
                     localEchoRepository.updateSendState(localEcho.eventId, roomId, SendState.UNSENT)
                     internalSendMedia(listOf(localEcho.root), attachmentData, true)
@@ -194,7 +194,7 @@ internal class DefaultSendService @AssistedInject constructor(
                             name = messageContent.body,
                             queryUri = Uri.parse(messageContent.url),
                             type = ContentAttachmentData.Type.VIDEO,
-                            blurHash = messageContent.videoInfo?.blurHash
+                            thumbHash = messageContent.videoInfo?.thumbHash ?: messageContent.videoInfo?.blurHash
                     )
                     localEchoRepository.updateSendState(localEcho.eventId, roomId, SendState.UNSENT)
                     internalSendMedia(listOf(localEcho.root), attachmentData, true)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index 6e9ded608adb7df60a21c848d0436b530d97a1c7..cf0d54d08963a4f6dac941c1103af25db9da7f40 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -435,7 +435,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                         width = width?.toInt() ?: 0,
                         height = height?.toInt() ?: 0,
                         size = attachment.size,
-                        blurHash = attachment.blurHash
+                        thumbHash = attachment.thumbHash
                 ),
                 url = attachment.queryUri.toString(),
                 relatesTo = relatesTo ?: rootThreadEventId?.let { generateThreadRelationContent(it) }
@@ -479,7 +479,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                         // Glide will be able to use the local path and extract a thumbnail.
                         thumbnailUrl = attachment.queryUri.toString(),
                         thumbnailInfo = thumbnailInfo,
-                        blurHash = attachment.blurHash
+                        thumbHash = attachment.thumbHash
                 ),
                 url = attachment.queryUri.toString(),
                 relatesTo = relatesTo ?: rootThreadEventId?.let { generateThreadRelationContent(it) }