diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/IsUselessResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/IsUselessResolver.kt
index eb149467b0..56ce488f1b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/IsUselessResolver.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/IsUselessResolver.kt
@@ -29,7 +29,8 @@ internal object IsUselessResolver {
         return when (event.type) {
             EventType.STATE_ROOM_MEMBER -> {
                 // Call toContent(), to filter out null value
-                event.content?.toContent() == event.resolvedPrevContent()?.toContent()
+                event.content != null
+                        && event.content.toContent() == event.resolvedPrevContent()?.toContent()
             }
             else                        -> false
         }