diff --git a/packages/chat-component/src/components/chat-thread-component.ts b/packages/chat-component/src/components/chat-thread-component.ts
index 3d912d4e..faa6a448 100644
--- a/packages/chat-component/src/components/chat-thread-component.ts
+++ b/packages/chat-component/src/components/chat-thread-component.ts
@@ -177,19 +177,21 @@ export class ChatThreadComponent extends LitElement {
         <div class="items__listWrapper">
           ${unsafeSVG(iconQuestion)}
           <ul class="items__list followup">
-            ${followupQuestions.map(
-              (followupQuestion) => html`
-                <li class="items__listItem--followup">
-                  <a
-                    class="items__link"
-                    href="#"
-                    data-testid="followUpQuestion"
-                    @click="${(event) => this.handleFollowupQuestionClick(followupQuestion, entry, event)}"
-                    >${followupQuestion}</a
-                  >
-                </li>
-              `,
-            )}
+            ${followupQuestions
+              .filter((q) => q !== null)
+              .map(
+                (followupQuestion) => html`
+                  <li class="items__listItem--followup">
+                    <a
+                      class="items__link"
+                      href="#"
+                      data-testid="followUpQuestion"
+                      @click="${(event) => this.handleFollowupQuestionClick(followupQuestion, entry, event)}"
+                      >${followupQuestion}</a
+                    >
+                  </li>
+                `,
+              )}
           </ul>
         </div>
       `;