diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
index f0f9c250e1feccc4d108665d0311c83a1d7d0741..f5655ad65e5ae179d8c2d4f1c884194e269283fc 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
@@ -1,15 +1,15 @@
 import { Bescheid, BescheidService } from '@alfa-client/bescheid-shared';
 import {
   AbstractFormService,
-  StateResource,
   asBoolean,
   formatForDatabase,
+  StateResource,
 } from '@alfa-client/tech-shared';
 import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
 import { Injectable } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { isNil } from 'lodash-es';
-import { BehaviorSubject, Observable, map, startWith } from 'rxjs';
+import { BehaviorSubject, map, Observable, startWith } from 'rxjs';
 
 @Injectable()
 export class BescheidenFormService extends AbstractFormService {
@@ -19,7 +19,7 @@ export class BescheidenFormService extends AbstractFormService {
 
   public readonly bescheidChanges$: BehaviorSubject<Bescheid>;
 
-  public vorgang: VorgangWithEingangResource;
+  private vorgangWithEingangResource: VorgangWithEingangResource;
 
   constructor(
     formBuilder: UntypedFormBuilder,
@@ -65,7 +65,10 @@ export class BescheidenFormService extends AbstractFormService {
   }
 
   protected doSubmit(): Observable<StateResource<any>> {
-    return this.bescheidService.createBescheidDraft(this.vorgang, this.getValue());
+    return this.bescheidService.createBescheidDraft(
+      this.vorgangWithEingangResource,
+      this.getValue(),
+    );
   }
 
   public getValue(): Bescheid {
@@ -79,4 +82,10 @@ export class BescheidenFormService extends AbstractFormService {
   public getBescheidChanges(): Observable<Bescheid> {
     return this.bescheidChanges$.asObservable();
   }
+
+  public setVorgangWithEingangResource(
+    vorgangWithEingangResource: VorgangWithEingangResource,
+  ): void {
+    this.vorgangWithEingangResource = vorgangWithEingangResource;
+  }
 }
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts
index 24d6b1d8c27d1034fedac18ecde713f648815aca..27efdfe3a12c687a96836d03f66d955f3b6021aa 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts
@@ -75,12 +75,20 @@ describe('VorgangDetailBescheidenComponent', () => {
   });
 
   describe('ngOnInit', () => {
+    it('should set vorgang on form service', () => {
+      const setVorgangWithEingangResource = (formService.setVorgangWithEingangResource = jest.fn());
+
+      component.ngOnInit();
+
+      expect(setVorgangWithEingangResource).toBeCalledWith(vorgangWithEingangResource);
+    });
+
     it('should patch values', () => {
-      const mock = (formService.patchValues = jest.fn());
+      const patchValues = (formService.patchValues = jest.fn());
 
       component.ngOnInit();
 
-      expect(mock).toBeCalledWith(bescheidDraftResource);
+      expect(patchValues).toBeCalledWith(bescheidDraftResource);
     });
   });
 
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts
index 9acc3dbab2a7ea0a0acd7b58c4c79ce4d3d6c737..f4fb2cc67cf83cca0570129a0f4e652ef89aa4ee 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts
@@ -24,7 +24,9 @@ export class VorgangDetailBescheidenComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.formService.vorgang = this.dialogRef.config.data.vorgangWithEingangResource;
+    this.formService.setVorgangWithEingangResource(
+      this.dialogRef.config.data.vorgangWithEingangResource,
+    );
     this.formService.patchValues(this.bescheidDraftResource);
   }