diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index aa307d7c8e..cf31327e18 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -663,14 +663,14 @@ internal class DefaultCryptoService @Inject constructor(
             // Notify the our listeners about room keys so decryption is retried.
             if (toDeviceEvents.events != null) {
                 toDeviceEvents.events.forEach { event ->
-                    if (event.type == "m.room_key") {
+                    if (event.type == EventType.ROOM_KEY) {
                         val content = event.getClearContent().toModel<RoomKeyContent>() ?: return@forEach
 
                         val roomId = content.sessionId ?: return@forEach
                         val sessionId = content.sessionId
 
                         notifyRoomKeyReceival(roomId, sessionId)
-                    } else if (event.type == "m.forwarded_room_key") {
+                    } else if (event.type == EventType.FORWARDED_ROOM_KEY) {
                         val content = event.getClearContent().toModel<ForwardedRoomKeyContent>() ?: return@forEach
 
                         val roomId = content.sessionId ?: return@forEach