diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index e005029c425..b572930a09c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -280,7 +280,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete);
 		const result = this.renderMarkdown(new MarkdownString(markdownValue), element, templateData.elementDisposables, templateData, fillInIncompleteTokens);
 		dom.clearNode(templateData.value);
-		result.element.ariaLabel = this._accessibilityProvider.getAriaLabel(element);
 		templateData.value.appendChild(result.element);
 		templateData.elementDisposables.add(result);
 
@@ -439,6 +438,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 		if (isResponseVM(element)) {
 			this.codeBlocksByResponseId.set(element.id, codeblocks);
+			result.element.ariaLabel = this._accessibilityProvider.getAriaLabel(element);
 			disposables.add(toDisposable(() => this.codeBlocksByResponseId.delete(element.id)));
 		}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatViewModel.ts b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
index 1619d829028..ba66ad2c6cd 100644
--- a/src/vs/workbench/contrib/chat/common/chatViewModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
@@ -258,8 +258,6 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 
 	renderData: IChatResponseRenderData | undefined = undefined;
 
-	codeBlockCount: number | undefined;
-
 	currentRenderedHeight: number | undefined;
 
 	private _contentUpdateTimings: IChatLiveUpdateData | undefined = undefined;