diff --git a/web/src/ChatBox.js b/web/src/ChatBox.js
index cb0e0cc4..54337c3d 100644
--- a/web/src/ChatBox.js
+++ b/web/src/ChatBox.js
@@ -30,7 +30,7 @@ class ChatBox extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (prevProps.messages !== this.props.messages && this.props.messages !== null) {
+    if (prevProps.messages !== this.props.messages && this.props.messages !== undefined && this.props.messages !== null) {
       this.scrollToListItem(this.props.messages.length);
     }
   }
diff --git a/web/src/ChatMenu.js b/web/src/ChatMenu.js
index 11d2a0af..baeb6bb1 100644
--- a/web/src/ChatMenu.js
+++ b/web/src/ChatMenu.js
@@ -110,8 +110,12 @@ class ChatMenu extends React.Component {
     return items.map((item, index) => `${index}`);
   }
 
-  setSelectedKeyToNewChat() {
+  setSelectedKeyToNewChat(chats) {
+    const items = this.chatsToItems(chats);
+    const openKeys = items.map((item) => item.key);
+
     this.setState({
+      openKeys: openKeys,
       selectedKeys: ["0-0"],
     });
   }
diff --git a/web/src/ChatPage.js b/web/src/ChatPage.js
index f3e0b61e..fad63b01 100644
--- a/web/src/ChatPage.js
+++ b/web/src/ChatPage.js
@@ -120,7 +120,7 @@ class ChatPage extends BaseListPage {
           if (j < 0) {
             this.setState({
               chatName: undefined,
-              messages: undefined,
+              messages: [],
               data: data,
             });
           } else {
@@ -180,7 +180,7 @@ class ChatPage extends BaseListPage {
         </div>
         <div style={{flex: 1, height: "100%", backgroundColor: "white", position: "relative"}}>
           {
-            this.state.messages === null ? null : (
+            (this.state.messages === undefined || this.state.messages === null) ? null : (
               <div style={{
                 position: "absolute",
                 top: -50,
@@ -224,6 +224,7 @@ class ChatPage extends BaseListPage {
           this.setState({
             loading: false,
             data: res.data,
+            messages: [],
             pagination: {
               ...params.pagination,
               total: res.data2,
@@ -242,7 +243,7 @@ class ChatPage extends BaseListPage {
           }
 
           if (!setLoading) {
-            this.menu.current.setSelectedKeyToNewChat();
+            this.menu.current.setSelectedKeyToNewChat(chats);
           }
         } else {
           if (Setting.isResponseDenied(res)) {