diff --git a/im-ui/src/view/Home.vue b/im-ui/src/view/Home.vue
index f3202ef..d70cdbb 100644
--- a/im-ui/src/view/Home.vue
+++ b/im-ui/src/view/Home.vue
@@ -145,11 +145,12 @@
 					method: 'get'
 				}).then((msgInfos) => {
 					msgInfos.forEach((msgInfo) => {
-						// 标记这条消息是不是自己发的
 						msgInfo.selfSend = msgInfo.sendId == this.$store.state.userStore.userInfo.id;
 						let groupId = msgInfo.groupId;
 						let group = this.$store.state.groupStore.groups.find((g) => g.id == groupId);
-						this.handleGroupMessage(group,msgInfo);
+						if(group){
+							this.insertGroupMessage(group,msgInfo);
+						}
 					})
 					if (msgInfos.length == 100) {
 						// 继续拉取
diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index be4ed1d..f7a4b71 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -69,7 +69,12 @@
 					method: 'get'
 				}).then((msgInfos) => {
 					msgInfos.forEach((msgInfo) => {
-						this.handlePrivateMessage(msgInfo);
+						msgInfo.selfSend = msgInfo.sendId == store.state.userStore.userInfo.id;
+						let friendId = msgInfo.selfSend ? msgInfo.recvId : msgInfo.sendId;
+						let friend = store.state.friendStore.friends.find((f) => f.id == friendId);
+						if(friend){
+							this.insertPrivateMessage(friend,msgInfo);
+						}	
 					})
 					if (msgInfos.length == 100) {
 						// 继续拉取
@@ -86,7 +91,12 @@
 					method: 'get'
 				}).then((msgInfos) => {
 					msgInfos.forEach((msgInfo) => {
-						this.handleGroupMessage(msgInfo);
+						msgInfo.selfSend = msgInfo.sendId == store.state.userStore.userInfo.id;
+						let groupId = msgInfo.groupId;
+						let group = store.state.groupStore.groups.find((g) => g.id == groupId);
+						if(group){
+							this.insertGroupMessage(group,msgInfo);
+						}
 					})
 					if (msgInfos.length == 100) {
 						// 继续拉取