diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
index 9fe246ec17968ff9e7e4052f84745bc03bf5c0d2..be450d87ce5ffa35b8a884eb888224759b68880a 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
@@ -2,6 +2,7 @@ package de.ozgcloud.eingang.semantik.formbased.mantelantrag;
 
 import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
 import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormHeader;
 import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
 import de.ozgcloud.eingang.semantik.formbased.FormBasedMapper;
 import lombok.RequiredArgsConstructor;
@@ -34,7 +35,7 @@ public class MantelantragZustaendigeStelleMapper implements FormBasedMapper {
 	@Override
 	public boolean isResponsible(FormData formData) {
 		return Optional.ofNullable(formData.getHeader())
-				.flatMap(header -> Optional.ofNullable(header.getFormId()))
+				.map(FormHeader::getFormId)
 				.map(MANTELANTRAG_FORM_ID::equals)
 				.orElse(false);
 	}