diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
index 8507423b..104b23fc 100644
--- a/packages/stream_chat/lib/src/client/client.dart
+++ b/packages/stream_chat/lib/src/client/client.dart
@@ -1340,7 +1340,7 @@ class ClientState {
               event.me != null && event.type != EventType.healthCheck)
           .map((e) => e.me!)
           .listen((user) {
-        currentUser = user;
+        currentUser = currentUser?.merge(user) ?? user;
         final totalUnreadCount = user.totalUnreadCount;
         _totalUnreadCountController.add(totalUnreadCount);