diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 5af7306ff8..4a11d20378 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -928,7 +928,9 @@ export const ChatRowContent = ({
 						/>
 					)
 				case "condense_context":
-					return <ContextCondenseRow contextCondense={message.contextCondense} />
+					return message.contextCondense ? (
+						<ContextCondenseRow contextCondense={message.contextCondense} />
+					) : null
 				default:
 					return (
 						<>
diff --git a/webview-ui/src/components/chat/ContextCondenseRow.tsx b/webview-ui/src/components/chat/ContextCondenseRow.tsx
index ea383139b3..1d9a0e53a2 100644
--- a/webview-ui/src/components/chat/ContextCondenseRow.tsx
+++ b/webview-ui/src/components/chat/ContextCondenseRow.tsx
@@ -4,19 +4,10 @@ import { VSCodeBadge } from "@vscode/webview-ui-toolkit/react"
 
 import { ContextCondense } from "@roo/schemas"
 
-interface ContextCondenseRowProps {
-	contextCondense?: ContextCondense
-}
-
-const ContextCondenseRow = ({ contextCondense }: ContextCondenseRowProps) => {
+const ContextCondenseRow = ({ cost, prevContextTokens, newContextTokens, summary }: ContextCondense) => {
 	const { t } = useTranslation()
 	const [isExpanded, setIsExpanded] = useState(false)
 
-	if (!contextCondense) {
-		return null
-	}
-	const { cost, prevContextTokens, newContextTokens, summary } = contextCondense
-
 	return (
 		<div className="mb-2">
 			<div