diff --git a/ui/components/MessageBox.tsx b/ui/components/MessageBox.tsx
index 61f4f05..499c3d6 100644
--- a/ui/components/MessageBox.tsx
+++ b/ui/components/MessageBox.tsx
@@ -193,10 +193,12 @@ const MessageBox = ({
             <SearchImages
               query={history[messageIndex - 1].content}
               chatHistory={history.slice(0, messageIndex - 1)}
+              messageId={message.messageId}
             />
             <SearchVideos
               chatHistory={history.slice(0, messageIndex - 1)}
               query={history[messageIndex - 1].content}
+              messageId={message.messageId}
             />
           </div>
         </div>
diff --git a/ui/components/MessageSources.tsx b/ui/components/MessageSources.tsx
index c7ee945..fb2b5bb 100644
--- a/ui/components/MessageSources.tsx
+++ b/ui/components/MessageSources.tsx
@@ -69,11 +69,15 @@ const MessageSources = ({ sources }: { sources: Document[] }) => {
           <div className="flex flex-row items-center space-x-1">
             {sources.slice(3, 6).map((source, i) => {
               return source.metadata.url === 'File' ? (
-                <div className="bg-dark-200 hover:bg-dark-100 transition duration-200 flex items-center justify-center w-6 h-6 rounded-full">
+                <div
+                  key={i}
+                  className="bg-dark-200 hover:bg-dark-100 transition duration-200 flex items-center justify-center w-6 h-6 rounded-full"
+                >
                   <File size={12} className="text-white/70" />
                 </div>
               ) : (
                 <img
+                  key={i}
                   src={`https://s2.googleusercontent.com/s2/favicons?domain_url=${source.metadata.url}`}
                   width={16}
                   height={16}