diff --git a/src/app/(user)/user/profiles/page.tsx b/src/app/(user)/user/profiles/page.tsx
index 04b525b..71a670f 100644
--- a/src/app/(user)/user/profiles/page.tsx
+++ b/src/app/(user)/user/profiles/page.tsx
@@ -567,6 +567,7 @@ function ProfilesPageContent() {
   };
 
   const handleSearch = () => {
+    if (!searchQuery.trim()) return;
     setCurrentPage(1);
     fetchAgents();
   };
diff --git a/src/components/message/MessagingPage.tsx b/src/components/message/MessagingPage.tsx
index 2b04108..476f7db 100644
--- a/src/components/message/MessagingPage.tsx
+++ b/src/components/message/MessagingPage.tsx
@@ -1018,7 +1018,7 @@ export function MessagingPage({ initialConversationId, initialAgentProfileId }:
                                     </div>
                                   </a>
                                 ) : (
-                                  <p className="font-serif font-normal text-[14px] leading-[19px]">
+                                  <p className="font-serif font-normal text-[14px] leading-[19px] break-words whitespace-pre-wrap [overflow-wrap:anywhere]">
                                     {message.content}
                                   </p>
                                 )}