diff --git a/lib/features/auth/data_layer/model/login_response.dart b/lib/features/auth/data_layer/model/login_response.dart
index 2784296..9eb0266 100644
--- a/lib/features/auth/data_layer/model/login_response.dart
+++ b/lib/features/auth/data_layer/model/login_response.dart
@@ -15,8 +15,8 @@ class LoginResponseModel {
       LoginResponseModel(
         user: User.fromJson(json["user"]),
         token: json["token"],
-        chatToken: json["chat_token"],
-        chatUserId: json["user"]["chat_user_id"],
+        chatToken: json["chat_token"] ?? '',
+        chatUserId: json["user"]["chat_user_id"] ?? 0,
       );
   factory LoginResponseModel.zero() => LoginResponseModel(
       user: User.zero(), token: "", chatToken: "", chatUserId: 0);
diff --git a/lib/features/auth/data_layer/model/user.dart b/lib/features/auth/data_layer/model/user.dart
index e823417..a6ea26c 100644
--- a/lib/features/auth/data_layer/model/user.dart
+++ b/lib/features/auth/data_layer/model/user.dart
@@ -24,7 +24,7 @@ class User {
         lastName: json["last_name"],
         email: json["email"],
         avatarImage: json['avatar'],
-        chatUserId: json["chat_user_id"],
+        chatUserId: json["chat_user_id"] ?? 0,
       );
 
   Map<String, dynamic> toJson() => {