diff --git a/web/src/app/chat/message/AgenticMessage.tsx b/web/src/app/chat/message/AgenticMessage.tsx
index d911d25ee..99a48d332 100644
--- a/web/src/app/chat/message/AgenticMessage.tsx
+++ b/web/src/app/chat/message/AgenticMessage.tsx
@@ -372,35 +372,33 @@ export const AgenticMessage = ({
     onMessageSelection &&
     otherMessagesCanSwitchTo &&
     otherMessagesCanSwitchTo.length > 1;
-  const currentIndexRef = useRef(0);
 
   useEffect(() => {
     if (!allowStreaming) {
+      //   if (typeof content === "string") {
+      //     setStreamedContent(finalContent);
+      //     setLastKnownContentLength(finalContent.length);
+      //   }
       return;
     }
 
     if (typeof finalContent !== "string") return;
 
+    let currentIndex = streamedContent.length;
     let intervalId: NodeJS.Timeout | null = null;
 
+    // if (finalContent.length > currentIndex) {
     intervalId = setInterval(() => {
       setStreamedContent((prev) => {
-        if (streamedContent.length == finalContent.length) {
-          return finalContent;
-        }
-        if (currentIndexRef.current < finalContent.length) {
-          const nextLength = Math.min(
-            currentIndexRef.current + 5,
-            finalContent.length
-          );
-          currentIndexRef.current = nextLength;
+        if (prev.length < finalContent.length) {
+          const nextLength = Math.min(prev.length + 5, finalContent.length);
           return finalContent.slice(0, nextLength);
         } else {
           if (intervalId) clearInterval(intervalId);
           return finalContent;
         }
       });
-    }, 5);
+    }, 10);
     // } else {
     //   setStreamedContent(finalContent);
     // }
@@ -447,7 +445,7 @@ export const AgenticMessage = ({
                       subQuestions={subQuestions}
                       secondLevelQuestions={secondLevelSubquestions || []}
                       documents={
-                        isViewingInitialAnswer || (!agenticDocs && docs)
+                        isViewingInitialAnswer
                           ? (docs && docs.length > 0 ? docs : agenticDocs)!
                           : (agenticDocs && agenticDocs.length > 0
                               ? agenticDocs
@@ -474,81 +472,47 @@ export const AgenticMessage = ({
                             Answer
                           </div>
 
-                          {/* {
-                            <div className="bg-gray-100 p-4 rounded-md shadow-sm">
-                              <p>
-                                isGenerating: {isGenerating ? "true" : "false"}
-                              </p>
-                              <p>
-                                secondLevelGenerating:{" "}
-                                {secondLevelGenerating ? "true" : "false"}
-                              </p>
-                              <p>
-                                isImprovement:{" "}
-                                {isImprovement === null ? "null" : "not null"}
-                              </p>
-                              <p>
-                                subQuestions:{" "}
-                                {subQuestions ? "exists" : "does not exist"}
-                              </p>
-                              <p>
-                                subQuestions length:{" "}
-                                {subQuestions ? subQuestions.length : "N/A"}
-                              </p>
-                            </div>
-                          } */}
-                          {/* {isImprovement ? "true" : "false"} */}
-                          {
-                            // !isGenerating &&
-                            secondLevelGenerating &&
-                            isImprovement == null &&
-                            subQuestions &&
-                            subQuestions.length > 0 ? (
-                              <RefinemenetBadge
-                                finished={!secondLevelGenerating}
-                                overallAnswer={
-                                  secondLevelAssistantMessage || ""
-                                }
-                                secondLevelSubquestions={
-                                  secondLevelSubquestions
-                                }
-                                toggleInitialAnswerVieinwg={() => {
-                                  setIsViewingInitialAnswer(
-                                    !isViewingInitialAnswer
-                                  );
+                          {isImprovement == null &&
+                          subQuestions &&
+                          subQuestions.length > 0 ? (
+                            <RefinemenetBadge
+                              finished={!secondLevelGenerating}
+                              overallAnswer={secondLevelAssistantMessage || ""}
+                              secondLevelSubquestions={secondLevelSubquestions}
+                              toggleInitialAnswerVieinwg={() => {
+                                setIsViewingInitialAnswer(
+                                  !isViewingInitialAnswer
+                                );
+                              }}
+                              isViewingInitialAnswer={isViewingInitialAnswer}
+                            />
+                          ) : secondLevelAssistantMessage ? (
+                            isImprovement ? (
+                              <Badge
+                                // NOTE: This is a hack to make the badge slightly higher
+                                className="cursor-pointer mt-[1px]"
+                                variant="agent"
+                                onClick={() => {
+                                  const viewInitialAnswer =
+                                    !isViewingInitialAnswer;
+                                  setIsViewingInitialAnswer(viewInitialAnswer);
+                                  toggleDocDisplay &&
+                                    toggleDocDisplay(isViewingInitialAnswer);
+                                  if (viewInitialAnswer) {
+                                    setIsViewingInitialAnswer(true);
+                                  }
                                 }}
-                                isViewingInitialAnswer={isViewingInitialAnswer}
-                              />
-                            ) : secondLevelAssistantMessage ? (
-                              isImprovement ? (
-                                <Badge
-                                  // NOTE: This is a hack to make the badge slightly higher
-                                  className="cursor-pointer mt-[1px]"
-                                  variant="agent"
-                                  onClick={() => {
-                                    const viewInitialAnswer =
-                                      !isViewingInitialAnswer;
-                                    setIsViewingInitialAnswer(
-                                      viewInitialAnswer
-                                    );
-                                    toggleDocDisplay &&
-                                      toggleDocDisplay(isViewingInitialAnswer);
-                                    if (viewInitialAnswer) {
-                                      setIsViewingInitialAnswer(true);
-                                    }
-                                  }}
-                                >
-                                  {isViewingInitialAnswer
-                                    ? "See Refined Answer"
-                                    : "See Original Answer"}
-                                </Badge>
-                              ) : (
-                                <NoNewAnswerMessage />
-                              )
+                              >
+                                {isViewingInitialAnswer
+                                  ? "See Refined Answer"
+                                  : "See Original Answer"}
+                              </Badge>
                             ) : (
-                              <></>
+                              <NoNewAnswerMessage />
                             )
-                          }
+                          ) : (
+                            <></>
+                          )}
                         </div>
 
                         <div className="px-4">