diff --git a/src/app/api/images/route.ts b/src/app/api/images/route.ts
index 9cfabb2..ab7dffb 100644
--- a/src/app/api/images/route.ts
+++ b/src/app/api/images/route.ts
@@ -21,7 +21,10 @@ export const POST = async (req: Request) => {
 
     const images = await searchImages(
       {
-        chatHistory: body.chatHistory,
+        chatHistory: body.chatHistory.map(([role, content]) => ({
+          role: role === 'human' ? 'user' : 'assistant',
+          content,
+        })),
         query: body.query,
       },
       llm,
diff --git a/src/app/api/suggestions/route.ts b/src/app/api/suggestions/route.ts
index 07432d6..0f4587c 100644
--- a/src/app/api/suggestions/route.ts
+++ b/src/app/api/suggestions/route.ts
@@ -20,7 +20,10 @@ export const POST = async (req: Request) => {
 
     const suggestions = await generateSuggestions(
       {
-        chatHistory: body.chatHistory,
+        chatHistory: body.chatHistory.map(([role, content]) => ({
+          role: role === 'human' ? 'user' : 'assistant',
+          content,
+        })),
       },
       llm,
     );
diff --git a/src/app/api/videos/route.ts b/src/app/api/videos/route.ts
index 0d5e03c..7bbf59a 100644
--- a/src/app/api/videos/route.ts
+++ b/src/app/api/videos/route.ts
@@ -21,7 +21,10 @@ export const POST = async (req: Request) => {
 
     const videos = await handleVideoSearch(
       {
-        chatHistory: body.chatHistory,
+        chatHistory: body.chatHistory.map(([role, content]) => ({
+          role: role === 'human' ? 'user' : 'assistant',
+          content,
+        })),
         query: body.query,
       },
       llm,
diff --git a/src/components/MessageBox.tsx b/src/components/MessageBox.tsx
index 19e3546..dd60dec 100644
--- a/src/components/MessageBox.tsx
+++ b/src/components/MessageBox.tsx
@@ -50,7 +50,14 @@ const MessageBox = ({
   dividerRef?: MutableRefObject<HTMLDivElement | null>;
   isLast: boolean;
 }) => {
-  const { loading, sendMessage, rewrite, messages, researchEnded } = useChat();
+  const {
+    loading,
+    sendMessage,
+    rewrite,
+    messages,
+    researchEnded,
+    chatHistory,
+  } = useChat();
 
   const parsedMessage = section.parsedTextBlocks.join('\n\n');
   const speechMessage = section.speechMessage || '';
@@ -265,11 +272,11 @@ const MessageBox = ({
           <div className="lg:sticky lg:top-20 flex flex-col items-center space-y-3 w-full lg:w-3/12 z-30 h-full pb-4">
             <SearchImages
               query={section.message.query}
-              chatHistory={messages}
+              chatHistory={chatHistory}
               messageId={section.message.messageId}
             />
             <SearchVideos
-              chatHistory={messages}
+              chatHistory={chatHistory}
               query={section.message.query}
               messageId={section.message.messageId}
             />
diff --git a/src/components/SearchImages.tsx b/src/components/SearchImages.tsx
index ca4d477..d393335 100644
--- a/src/components/SearchImages.tsx
+++ b/src/components/SearchImages.tsx
@@ -17,7 +17,7 @@ const SearchImages = ({
   messageId,
 }: {
   query: string;
-  chatHistory: Message[];
+  chatHistory: [string, string][];
   messageId: string;
 }) => {
   const [images, setImages] = useState<Image[] | null>(null);
diff --git a/src/components/SearchVideos.tsx b/src/components/SearchVideos.tsx
index 4084383..63b4ed8 100644
--- a/src/components/SearchVideos.tsx
+++ b/src/components/SearchVideos.tsx
@@ -30,7 +30,7 @@ const Searchvideos = ({
   messageId,
 }: {
   query: string;
-  chatHistory: Message[];
+  chatHistory: [string, string][];
   messageId: string;
 }) => {
   const [videos, setVideos] = useState<Video[] | null>(null);