diff --git a/frontend/src/conversation/ConversationMessages.tsx b/frontend/src/conversation/ConversationMessages.tsx
index 44f38159..49329445 100644
--- a/frontend/src/conversation/ConversationMessages.tsx
+++ b/frontend/src/conversation/ConversationMessages.tsx
@@ -145,7 +145,6 @@ export default function ConversationMessages({
           toolCalls={query.tool_calls}
           feedback={query.feedback}
           isStreaming={isCurrentlyStreaming}
-          attachmentsMetadata={query.attachments}
           handleFeedback={
             handleFeedback
               ? (feedback) => handleFeedback(query, feedback, index)
@@ -224,6 +223,7 @@ export default function ConversationMessages({
                 handleUpdatedQuestionSubmission={handleQuestionSubmission}
                 questionNumber={index}
                 sources={query.sources}
+                attachmentsMetadata={query.attachments}
               />
               {renderResponseView(query, index)}
             </Fragment>