diff --git a/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsx b/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsx
index bd89b886f1..bc5a3d950b 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsx
@@ -1,4 +1,5 @@
 import { AiChatMessage } from '@/ai/components/AiChatMessage';
+import { useRetryChatMessage } from '@/ai/hooks/useRetryChatMessage';
 import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';
 import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';
 import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';
@@ -9,6 +10,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
 import { isDefined } from 'twenty-shared/utils';
 
 export const AiChatLastMessageWithStreamingState = () => {
+  const { retryChatMessage } = useRetryChatMessage();
   const lastMessageId = useAtomComponentSelectorValue(
     agentChatLastMessageIdComponentSelector,
   );
@@ -34,6 +36,7 @@ export const AiChatLastMessageWithStreamingState = () => {
       messageId={lastMessageId}
       isLastMessageStreaming={agentChatIsStreaming}
       error={agentChatError ?? undefined}
+      onRetry={retryChatMessage}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
index 42599300a8..1ed3277982 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
@@ -144,12 +144,14 @@ type AiChatMessageProps = {
   messageId: string;
   isLastMessageStreaming?: boolean;
   error?: AiChatError | undefined;
+  onRetry?: () => void;
 };
 
 export const AiChatMessage = ({
   messageId,
   isLastMessageStreaming = false,
   error,
+  onRetry,
 }: AiChatMessageProps) => {
   const agentChatMessage = useAtomComponentFamilySelectorValue(
     agentChatMessageComponentFamilySelector,
@@ -187,7 +189,7 @@ export const AiChatMessage = ({
           </StyledFilesContainer>
         )}
         {shouldShowError && isDefined(error) && (
-          <AiChatErrorRenderer error={error} />
+          <AiChatErrorRenderer error={error} onRetry={onRetry} />
         )}
       </StyledMessageContainer>
       {agentChatMessage.parts.length > 0 && (