diff --git a/client/src/components/Messages/Message.jsx b/client/src/components/Messages/Message.jsx
index 7d61a110dd..c95a163398 100644
--- a/client/src/components/Messages/Message.jsx
+++ b/client/src/components/Messages/Message.jsx
@@ -101,23 +101,10 @@ export default function Message({
 
   const clickSearchResult = async () => {
     if (!searchResult) return;
-    // dispatch(setMessages([]));
     const convoResponse = await fetchById('convos', message.conversationId);
     const convo = convoResponse.data;
-    // if (convo?.chatGptLabel) {
-    //   // dispatch(setModel('chatgptCustom'));
-    //   // dispatch(setCustomModel(convo.chatGptLabel.toLowerCase()));
-    // } else {
-    //   // dispatch(setModel(convo.model));
-    //   // dispatch(setCustomModel(null));
-    // }
 
-    // dispatch(setCustomGpt(convo));
     switchToConversation(convo);
-    // dispatch(setConversation(convo));
-    // const { data } = await fetchById('messages', message.conversationId);
-    // dispatch(setMessages(data));
-    // dispatch(setDisabled(false));
   };
 
   return (
diff --git a/client/src/components/Messages/index.jsx b/client/src/components/Messages/index.jsx
index 45c56f1616..75dde9a249 100644
--- a/client/src/components/Messages/index.jsx
+++ b/client/src/components/Messages/index.jsx
@@ -94,6 +94,10 @@ export default function Messages({ isSearchView = false }) {
           </div>
           {_messagesTree === null ? (
             <Spinner />
+          ) : _messagesTree?.length == 0 && isSearchView ? (
+            <div className="flex w-full items-center justify-center gap-1 bg-gray-50 p-3 text-sm text-gray-500 dark:border-gray-900/50 dark:bg-gray-800 dark:text-gray-300">
+              Nothing found
+            </div>
           ) : (
             <>
               <MultiMessage
diff --git a/client/src/routes/Chat.jsx b/client/src/routes/Chat.jsx
index 1468dfa654..04cdf93a95 100644
--- a/client/src/routes/Chat.jsx
+++ b/client/src/routes/Chat.jsx
@@ -31,7 +31,13 @@ export default function Chat() {
         newConversation();
       } else if (conversationId) {
         // fetch it from server
-        conversationTrigger().then(setConversation);
+        conversationTrigger()
+          .then(setConversation)
+          .catch(error => {
+            console.error('failed to fetch the conversation');
+            console.error(error);
+            newConversation();
+          });
         setMessages(null);
       } else {
         navigate(`/chat/new`);