diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt
index 8c9180a8ee..578782d6c2 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt
@@ -28,10 +28,12 @@ class UtdTracker @Inject constructor(
 ) : UnableToDecryptDelegate {
     override fun onUtd(info: UnableToDecryptInfo) {
         Timber.d("onUtd for event ${info.eventId}, timeToDecryptMs: ${info.timeToDecryptMs}")
-        // TODO info will contain more information in the future, so that the app can report more precise data to the analytics.
         val event = Error(
             context = null,
+            // Keep cryptoModule for compatibility.
             cryptoModule = Error.CryptoModule.Rust,
+            cryptoSDK = Error.CryptoSDK.Rust,
+            timeToDecryptMillis = info.timeToDecryptMs?.toInt() ?: -1,
             domain = Error.Domain.E2EE,
             // TODO get a more specific error name from `info`
             name = Error.Name.OlmKeysNotSentError,