diff --git a/src/vs/platform/environment/common/environmentService.ts b/src/vs/platform/environment/common/environmentService.ts
index 004d0614c938a..bfd1ac7fd9b9b 100644
--- a/src/vs/platform/environment/common/environmentService.ts
+++ b/src/vs/platform/environment/common/environmentService.ts
@@ -282,6 +282,7 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 	}
 
 	get editSessionId(): string | undefined { return this.args['editSessionId']; }
+	set editSessionId(value: string | undefined) { this.args['editSessionId'] = value; }
 
 	get exportPolicyData(): string | undefined {
 		return this.args['export-policy-data'];
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
index 6b2968242cf60..6ae8eed8b4875 100644
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -266,8 +266,10 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 	@memoize
 	get profile(): string | undefined { return this.payload?.get('profile'); }
 
+	private _editSessionId: string | undefined;
 	@memoize
-	get editSessionId(): string | undefined { return this.options.editSessionId; }
+	get editSessionId(): string | undefined { return this._editSessionId ?? this.options.editSessionId; }
+	set editSessionId(value: string | undefined) { this._editSessionId = value; }
 
 	private payload: Map<string, string> | undefined;