diff --git a/apps/web/app/components/chat-message.tsx b/apps/web/app/components/chat-message.tsx
index e5aba40b421..0319ff5be95 100644
--- a/apps/web/app/components/chat-message.tsx
+++ b/apps/web/app/components/chat-message.tsx
@@ -777,9 +777,7 @@ export const ChatMessage = memo(function ChatMessage({ message, isStreaming, onS
 		const attachmentInfo = parseAttachments(textContent);
 		const richHtml = userHtmlMap?.get(message.id) ?? userHtmlMap?.get(textContent) ?? userHtmlMap?.get(attachmentInfo?.message ?? "");
 
-		const bubbleContent = richHtml
-			? <div className="chat-user-html-content" dangerouslySetInnerHTML={{ __html: richHtml }} />
-			: <p className="whitespace-pre-wrap break-words">{attachmentInfo?.message ?? textContent}</p>;
+		const bubbleContent = <p className="whitespace-pre-wrap wrap-break-word m-0">{attachmentInfo?.message ?? textContent}</p>;
 
 		if (attachmentInfo) {
 			return (
diff --git a/apps/web/app/globals.css b/apps/web/app/globals.css
index 2748e3f7eaa..ca7519caf29 100644
--- a/apps/web/app/globals.css
+++ b/apps/web/app/globals.css
@@ -224,6 +224,9 @@ body {
 .chat-user-html-content p:empty {
   min-height: 1em;
 }
+.chat-user-html-content p:empty:last-child {
+  display: none;
+}
 .chat-user-html-content strong {
   font-weight: 700;
 }