diff --git a/apps/nextjs/src/components/assistant/assistant-panel.tsx b/apps/nextjs/src/components/assistant/assistant-panel.tsx
index 443ceea1e..e7efa70a7 100644
--- a/apps/nextjs/src/components/assistant/assistant-panel.tsx
+++ b/apps/nextjs/src/components/assistant/assistant-panel.tsx
@@ -923,7 +923,8 @@ const RequestTelemetry = () => {
   const metadata = useAuiState((state) => state.message.metadata);
   const messageId = useAuiState((state) => state.message.id);
   const threadId = useAuiState((state) => state.threadListItem.remoteId);
-  const threadMessageMetadata = useAuiState((state) => state.thread.messages.map((message) => message.metadata));
+  const threadMessages = useAuiState((state) => state.thread.messages);
+  const threadMessageMetadata = useMemo(() => threadMessages.map((message) => message.metadata), [threadMessages]);
   const persistedTelemetry = getAssistantTelemetry(metadata);
   const persistedUsage = getAssistantUsage(metadata);
   const generationQuery = clientApi.assistant.getGenerationTelemetry.useQuery(