diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
index 7735023cc8..519112b1b7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomTypingUsersHandler.kt
@@ -31,10 +31,15 @@ internal class RoomTypingUsersHandler @Inject constructor(
 
     // TODO This could be handled outside of the Realm transaction. Use the new aggregator?
     fun handle(realm: Realm, roomId: String, ephemeralResult: RoomSyncHandler.EphemeralResult?) {
+        val typingUserIds = ephemeralResult?.typingUserIds
+        if (typingUserIds.isNullOrEmpty()) {
+            typingUsersTracker.setTypingUsersFromRoom(roomId, emptyList())
+            return
+        }
         // Filter ignored users and current user
         val filteredUserIds = realm.where(IgnoredUserEntity::class.java).findAll().map { it.userId } + userId
         val roomMemberHelper = RoomMemberHelper(realm, roomId)
-        val typingIds = ephemeralResult?.typingUserIds?.filter { it !in filteredUserIds }.orEmpty()
+        val typingIds = typingUserIds.filter { it !in filteredUserIds }
         val senderInfo = typingIds.map { userId ->
             val roomMemberSummaryEntity = roomMemberHelper.getLastRoomMember(userId)
             SenderInfo(