diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java
index f766f9e94b76df0b35729de5bdc89e0d44af1363..3026ef0557c2429687407ab968f60f6c31a85c13 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java
@@ -33,9 +33,6 @@ import de.ozgcloud.alfa.collaboration.OrganisationsEinheit;
 interface ForwardVorgangCommandBodyMapper {
 
 	@Mapping(target = "organisationsEinheitId", ignore = true)
-	@Mapping(target = "strasse", source = "anschrift.strasse")
-	@Mapping(target = "hausnummer", source = "anschrift.hausnummer")
-	@Mapping(target = "plz", source = "anschrift.plz")
-	@Mapping(target = "ort", source = "anschrift.ort")
+	@Mapping(target = ".", source = "anschrift")
 	ForwardVorgangCommandBody updateFromOrganisationsEinheit(OrganisationsEinheit organisationsEinheit, @MappingTarget ForwardVorgangCommandBody commandBody);
 }