diff --git a/packages/trace-viewer/src/ui/aiConversation.tsx b/packages/trace-viewer/src/ui/aiConversation.tsx
index ff5f288894..548ed626f0 100644
--- a/packages/trace-viewer/src/ui/aiConversation.tsx
+++ b/packages/trace-viewer/src/ui/aiConversation.tsx
@@ -46,7 +46,7 @@ export function AIConversation({ conversationId }: { conversationId: string }) {
               </div>
             )}
             <div className='message-content'>
-              <Markdown>{message.displayContent ?? message.content}</Markdown>
+              <Markdown options={{ disableParsingRawHTML: true }}>{message.displayContent ?? message.content}</Markdown>
             </div>
           </div>
         ))}
diff --git a/packages/trace-viewer/src/ui/llm.tsx b/packages/trace-viewer/src/ui/llm.tsx
index 162c33fd4c..c4093c1d51 100644
--- a/packages/trace-viewer/src/ui/llm.tsx
+++ b/packages/trace-viewer/src/ui/llm.tsx
@@ -250,8 +250,7 @@ export function useIsLLMAvailable() {
 }
 
 export function useLLMConversation(id: string) {
-  const chat = useLLMChat();
-  const conversation = React.useMemo(() => chat.getConversation(id), [chat, id]);
+  const conversation = useLLMChat().getConversation(id);
   if (!conversation)
     throw new Error('No conversation found for id: ' + id);
   const [history, setHistory] = React.useState(conversation.history);