diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index def4089783..9eddf55150 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -876,10 +876,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 						break
 					}
 					case "telemetrySetting": {
-						const telemetrySetting = message.telemetrySetting
-						await this.updateGlobalState("telemetrySetting", telemetrySetting)
-						const isOptedIn = telemetrySetting === "enabled"
-						telemetryService.updateTelemetryState(isOptedIn)
+						if (message.telemetrySetting) {
+							await this.updateTelemetrySetting(message.telemetrySetting)
+						}
 						await this.postStateToWebview()
 						break
 					}
@@ -893,14 +892,12 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 						await this.updateCustomInstructions(message.customInstructionsSetting)
 
 						// telemetry setting
-						const telemetrySetting = message.telemetrySetting
-						await this.updateGlobalState("telemetrySetting", telemetrySetting)
-						const isOptedIn = telemetrySetting === "enabled"
-						telemetryService.updateTelemetryState(isOptedIn)
+						if (message.telemetrySetting) {
+							await this.updateTelemetrySetting(message.telemetrySetting)
+						}
 
 						// plan act setting
-						const planActSeparateModelsSetting = message.planActSeparateModelsSetting
-						await this.updateGlobalState("planActSeparateModelsSetting", planActSeparateModelsSetting)
+						await this.updateGlobalState("planActSeparateModelsSetting", message.planActSeparateModelsSetting)
 
 						// after settings are updated, post state to webview
 						await this.postStateToWebview()
@@ -915,6 +912,12 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		)
 	}
 
+	async updateTelemetrySetting(telemetrySetting: TelemetrySetting) {
+		await this.updateGlobalState("telemetrySetting", telemetrySetting)
+		const isOptedIn = telemetrySetting === "enabled"
+		telemetryService.updateTelemetryState(isOptedIn)
+	}
+
 	async togglePlanActModeWithChatSettings(chatSettings: ChatSettings, chatContent?: ChatContent) {
 		const didSwitchToActMode = chatSettings.mode === "act"