diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.html
index b3bfb1538753c8df0cc58e2015206dd981c6590e..ad97972cd9cc4c7e7f135d96b2b755378f953b3e 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.html
@@ -1 +1 @@
-<alfa-forwarding-dialog [selectedSearchResult]="selectedSearchResult$ | async"/>
\ No newline at end of file
+<alfa-forwarding-dialog [selectedSearchResult]="selectedSearchResult$ | async" data-test-id="forwarding-dialog"/>
\ No newline at end of file
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.spec.ts
index 55f96686b633f51075cef31b5148166501495549..355c614cc694333be2f34a629eac5ad5b527035e 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.spec.ts
@@ -1,8 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { mock, Mock } from '@alfa-client/test-utils';
-import { SearchOrganisationsEinheitContainerComponent } from '@alfa-client/zustaendige-stelle';
 import { OrganisationsEinheitService, ZUSTAENDIGE_STELLE_SERVICE } from '@alfa-client/zustaendige-stelle-shared';
+import { AsyncPipe } from '@angular/common';
 import { MockComponent } from 'ng-mocks';
 import { ForwardingDialogContainerComponent } from './forwarding-dialog-container.component';
 import { ForwardingDialogComponent } from './forwarding-dialog/forwarding-dialog.component';
@@ -15,20 +15,22 @@ describe('ForwardingDialogContainerComponent', () => {
 
   beforeEach(async () => {
     organisationsEinheitService = mock(OrganisationsEinheitService);
-    TestBed.overrideComponent(SearchOrganisationsEinheitContainerComponent, {
-      set: {
-        providers: [
-          {
-            provide: ZUSTAENDIGE_STELLE_SERVICE,
-            useValue: organisationsEinheitService,
-          },
-        ],
-      },
-    });
+
     await TestBed.configureTestingModule({
-      imports: [ForwardingDialogContainerComponent],
+      imports: [ForwardingDialogContainerComponent, AsyncPipe],
       declarations: [MockComponent(ForwardingDialogComponent)],
-    }).compileComponents();
+    })
+      .overrideComponent(ForwardingDialogContainerComponent, {
+        set: {
+          providers: [
+            {
+              provide: ZUSTAENDIGE_STELLE_SERVICE,
+              useValue: organisationsEinheitService,
+            },
+          ],
+        },
+      })
+      .compileComponents();
 
     fixture = TestBed.createComponent(ForwardingDialogContainerComponent);
     component = fixture.componentInstance;
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.ts
index 460f6325dd55a743f6578a890d621005a06471ef..afb2a3d5a97213615dcc22a98195e82fd916ed50 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog-container.component.ts
@@ -7,7 +7,7 @@ import {
   ZUSTAENDIGE_STELLE_SERVICE,
 } from '@alfa-client/zustaendige-stelle-shared';
 import { AsyncPipe } from '@angular/common';
-import { Component, inject } from '@angular/core';
+import { Component, inject, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ForwardingDialogComponent } from './forwarding-dialog/forwarding-dialog.component';
 
@@ -24,7 +24,7 @@ import { ForwardingDialogComponent } from './forwarding-dialog/forwarding-dialog
     },
   ],
 })
-export class ForwardingDialogContainerComponent {
+export class ForwardingDialogContainerComponent implements OnInit {
   private readonly organisationsEinheitService = inject(ZUSTAENDIGE_STELLE_SERVICE) as OrganisationsEinheitService;
 
   public selectedSearchResult$: Observable<OrganisationsEinheitResource>;