diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 08027aca83..59b3148f1c 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -184,6 +184,7 @@ export const ChatRowContent = ({ message, isExpanded, onToggleExpand, lastModifi
 		// For now, reset if the message timestamp changes.
 		return () => {
 			// Cleanup if needed, potentially reset retryAttempted if component unmounts or message changes significantly
+			setRetryAttempted(false)
 		}
 	}, [apiRequestFailedMessage, apiReqStreamingFailedMessage, isLast, message.ts, retryAttempted])