diff --git a/app/frontend/src/pages/chat/Chat.tsx b/app/frontend/src/pages/chat/Chat.tsx
index e3c0cfd77f..4ebaa721fc 100644
--- a/app/frontend/src/pages/chat/Chat.tsx
+++ b/app/frontend/src/pages/chat/Chat.tsx
@@ -385,6 +385,22 @@ const Chat = () => {
                                     <div key={index}>
                                         <UserChatMessage message={streamedAnswer[0]} />
                                         <div className={styles.chatMessageGpt}>
+                                            {/* Render images from data_points before text streams in */}
+                                            {!Array.isArray(streamedAnswer[1].context.data_points) &&
+                                                streamedAnswer[1].context.data_points.images &&
+                                                streamedAnswer[1].context.data_points.images.length > 0 && (
+                                                    <div className={styles.answerImages}>
+                                                        {streamedAnswer[1].context.data_points.images.map((img, i) => (
+                                                            <img
+                                                                key={`answer-image-${i}`}
+                                                                src={img}
+                                                                width="100"
+                                                                alt={`Answer image ${i + 1}`}
+                                                                className={styles.answerImage}
+                                                            />
+                                                        ))}
+                                                    </div>
+                                                )}
                                             <Answer
                                                 isStreaming={true}
                                                 key={index}
@@ -408,6 +424,22 @@ const Chat = () => {
                                     <div key={index}>
                                         <UserChatMessage message={answer[0]} />
                                         <div className={styles.chatMessageGpt}>
+                                            {/* Render images from data_points before text content */}
+                                            {!Array.isArray(answer[1].context.data_points) &&
+                                                answer[1].context.data_points.images &&
+                                                answer[1].context.data_points.images.length > 0 && (
+                                                    <div className={styles.answerImages}>
+                                                        {answer[1].context.data_points.images.map((img, i) => (
+                                                            <img
+                                                                key={`answer-image-${i}`}
+                                                                src={img}
+                                                                width="100"
+                                                                alt={`Answer image ${i + 1}`}
+                                                                className={styles.answerImage}
+                                                            />
+                                                        ))}
+                                                    </div>
+                                                )}
                                             <Answer
                                                 isStreaming={false}
                                                 key={index}