diff --git a/web/src/app/chat/message/AgenticMessage.tsx b/web/src/app/chat/message/AgenticMessage.tsx
index 3b9843a46e0f..9c1233414e08 100644
--- a/web/src/app/chat/message/AgenticMessage.tsx
+++ b/web/src/app/chat/message/AgenticMessage.tsx
@@ -251,9 +251,13 @@ export const AgenticMessage = ({
               : docs
         }
         subQuestions={
-          isViewingInitialAnswer
-            ? subQuestions || []
-            : [...(subQuestions || []), ...(secondLevelSubquestions || [])]
+          (isViewingInitialAnswer
+            ? subQuestions && subQuestions.length > 0
+              ? subQuestions
+              : secondLevelSubquestions
+            : secondLevelSubquestions && secondLevelSubquestions.length > 0
+              ? secondLevelSubquestions
+              : subQuestions) || undefined
         }
         openQuestion={openQuestion}
       >