diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index dac57917..772f1d35 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -318,6 +318,18 @@ export default function ChatHistory(props: ChatHistoryProps) {
                         data.chat &&
                         data.chat.map((chatMessage, index) => (
                             <>
+                                {chatMessage.trainOfThought && chatMessage.by === "khoj" && (
+                                    <TrainOfThoughtComponent
+                                        trainOfThought={chatMessage.trainOfThought?.map(
+                                            (train) => train.data,
+                                        )}
+                                        lastMessage={false}
+                                        agentColor={data?.agent?.color || "orange"}
+                                        key={`${index}trainOfThought`}
+                                        keyId={`${index}trainOfThought`}
+                                        completed={true}
+                                    />
+                                )}
                                 <ChatMessage
                                     key={`${index}fullHistory`}
                                     ref={
@@ -340,18 +352,6 @@ export default function ChatHistory(props: ChatHistoryProps) {
                                     onDeleteMessage={handleDeleteMessage}
                                     conversationId={props.conversationId}
                                 />
-                                {chatMessage.trainOfThought && chatMessage.by === "khoj" && (
-                                    <TrainOfThoughtComponent
-                                        trainOfThought={chatMessage.trainOfThought?.map(
-                                            (train) => train.data,
-                                        )}
-                                        lastMessage={false}
-                                        agentColor={data?.agent?.color || "orange"}
-                                        key={`${index}trainOfThought`}
-                                        keyId={`${index}trainOfThought`}
-                                        completed={true}
-                                    />
-                                )}
                             </>
                         ))}
                     {props.incomingMessages &&