diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index a4de2b67..861e4b6d 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## 4.0.0-beta.0
 
 ✅ Added
@@ -7,6 +8,13 @@
 🐞 Fixed
 
 - Minor fixes and improvements.
+=======
+## 3.6.1
+
+🐞 Fixed
+
+- [[#1081]](https://github.com/GetStream/stream-chat-flutter/issues/1081) Fixed a bug with user reconnection.
+>>>>>>> develop
 
 ## 3.6.0
 
diff --git a/packages/stream_chat/lib/src/ws/websocket.dart b/packages/stream_chat/lib/src/ws/websocket.dart
index de5475ce..a26bd1f6 100644
--- a/packages/stream_chat/lib/src/ws/websocket.dart
+++ b/packages/stream_chat/lib/src/ws/websocket.dart
@@ -155,7 +155,7 @@ class WebSocket with TimerHelper {
     final token = await tokenManager.loadToken(refresh: refreshToken);
     final params = {
       'user_id': user.id,
-      if (includeUserDetails) 'user_details': user,
+      'user_details': includeUserDetails ? user : {'id': user.id},
       'user_token': token.rawValue,
       'server_determines_connection_id': true,
     };
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 1550bb5f..8f7f4fbf 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -22,6 +22,10 @@
 - Added OpenGraph preview support for links in `StreamMessageInput`.
 - Removed video compression.
 
+## 3.6.1
+
+- Updated `stream_chat_flutter_core` dependency to [`3.6.1`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
+
 ## 3.6.0
 
 🐞 Fixed
@@ -59,6 +63,7 @@
 - Fix default `Channel` route not opening from `ChannelListView` when `ChannelAvatar` is tapped
 
 ## 3.4.0
+
 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
 
 🐞 Fixed
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index e0ba6fd8..667c031b 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -36,7 +36,11 @@ dependencies:
   rxdart: ^0.27.0
   share_plus: ^4.0.1
   shimmer: ^2.0.0
+<<<<<<< HEAD
   stream_chat_flutter_core: ^4.0.0-beta.0
+=======
+  stream_chat_flutter_core: ^3.6.1
+>>>>>>> develop
   substring_highlight: ^1.0.26
   url_launcher: ^6.0.3
   video_player: ^2.1.0
diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index 703e3294..63563cb5 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -9,6 +9,10 @@
 
 - Updated `stream_chat` dependency to [`4.0.0-beta.0`](https://pub.dev/packages/stream_chat/changelog).
 
+## 3.6.1
+
+- Updated `stream_chat` dependency to [`3.6.1`](https://pub.dev/packages/stream_chat/changelog).
+
 ## 3.6.0
 
 - Updated `stream_chat` dependency to [`3.6.0`](https://pub.dev/packages/stream_chat/changelog).