diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
index 23a89da9ae971ea81f4e4ff1252d579faae68be0..5196efb4e91e3627882d2c7ecda22666a639deef 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
@@ -52,6 +52,10 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
 		if (bayernZustaendigeStelleMetadataMapper.isResponsible(formData)) {
 			return bayernZustaendigeStelleMetadataMapper.parseZustaendigeStelleData(formData);
 		}
+		return parseZustaendigeStelleData(formData);
+	}
+
+	FormData parseZustaendigeStelleData(FormData formData) {
 		var zustaendigeStelleMap = getZustaendigeStelle(formData);
 		var organisationseinheitenID = getOrganisationseinheitenId(formData);
 		var builder = ZustaendigeStelle.builder();
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
index 234c2f054e7064632110874865412fa749ade32b..7eda28f0c99b23c1f220a0708972232f059d9790 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
@@ -69,14 +69,14 @@ class AfmZustaendigeStelleMapperTest {
 			void shouldReturnFormDataOnNonExistingZustaendigeStelleAndOrganisationseinheitenId() {
 				var emptyFormData = FormData.builder().formData(new HashMap<String, Object>()).build();
 
-				var parsedFormData = parseFormData(emptyFormData);
+				var parsedFormData = parseZustaendigeStelleData(emptyFormData);
 
 				assertThat(parsedFormData).isEqualTo(emptyFormData);
 			}
 
 			@Test
 			void shouldMapOrganisationseinheitenId() {
-				var parsedFormData = parseFormData(formData);
+				var parsedFormData = parseZustaendigeStelleData(formData);
 
 				assertThat(parsedFormData.getZustaendigeStelle().getOrganisationseinheitenId())
 						.isEqualTo(AfmZustaendigeStelleTestFactory.ORGANISATIONSEINHEITEN_ID);
@@ -84,18 +84,25 @@ class AfmZustaendigeStelleMapperTest {
 
 			@Test
 			void shouldMapBezeichnung() {
-				var parsedFormData = parseFormData(formData);
+				var parsedFormData = parseZustaendigeStelleData(formData);
 
 				assertThat(parsedFormData.getZustaendigeStelle().getBezeichnung()).isEqualTo(BEZEICHNUNG);
 			}
 
 			@Test
 			void shouldMapEmail() {
-				var parsedFormData = parseFormData(formData);
+				var parsedFormData = parseZustaendigeStelleData(formData);
 
 				assertThat(parsedFormData.getZustaendigeStelle().getEmail()).isEqualTo(AfmZustaendigeStelleTestFactory.EMAIL);
 			}
 
+			@Test
+			void shouldCallparseZustaendigeStelleData() {
+				parseFormData(formData);
+
+				verify(mapper).parseZustaendigeStelleData(formData);
+			}
+
 			@Test
 			void shouldCallParseBayernMetadata() {
 				when(bayernZustaendigeStelleMetadataMapper.isResponsible(any())).thenReturn(true);
@@ -107,6 +114,9 @@ class AfmZustaendigeStelleMapperTest {
 				assertThat(resultFormData).isEqualTo(expectedFormData);
 			}
 
+			private FormData parseZustaendigeStelleData(FormData formData) {
+				return mapper.parseZustaendigeStelleData(formData);
+			}
 		}
 
 		@Nested