diff --git a/server/api/ChatApi.ts b/server/api/ChatApi.ts
index df62104..c817d8d 100644
--- a/server/api/ChatApi.ts
+++ b/server/api/ChatApi.ts
@@ -41,8 +41,8 @@ export default class ChatApi extends BaseApi {
                     msg: "成功",
                     data: {
                         type: chat.bean.type,
-                        title: chat.getTitleForPrivate(mine),
-                        avatar: chat.bean.avatar_file_hash ? "uploaded_files/" + chat.bean.avatar_file_hash : chat.bean.avatar_file_hash
+                        title: chat.getTitle(mine),
+                        avatar: chat.getAvatarFileHash(mine) ? "uploaded_files/" + chat.getAvatarFileHash(mine) : undefined
                     }
                 }
             }
diff --git a/server/data/Chat.ts b/server/data/Chat.ts
index 15ac7fb..aca0c6e 100644
--- a/server/data/Chat.ts
+++ b/server/data/Chat.ts
@@ -90,7 +90,12 @@ export default class Chat {
 
         return null
     }
-    getTitleForPrivate(userMySelf: User) {
-        return this.getAnotherUserForPrivate(userMySelf)?.getNickName() || "未知對話"
+    getTitle(userMySelf?: User) {
+        if (this.bean.type == 'group') return this.bean.title
+        if (this.bean.type == 'private') return this.getAnotherUserForPrivate(userMySelf as User)?.getNickName()
+    }
+    getAvatarFileHash(userMySelf?: User) {
+        if (this.bean.type == 'group') return this.bean.avatar_file_hash
+        if (this.bean.type == 'private') return this.getAnotherUserForPrivate(userMySelf as User)?.getAvatarFileHash()
     }
 }