diff --git a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java
index 51fe575160c222b53e06325d106216edcd3e8e89..66431be6bf498d341a7b10ca8d38c7de46f42da3 100644
--- a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java
+++ b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryController.java
@@ -72,9 +72,7 @@ public class EntryController {
 
 		var builder = formData.toBuilder();
 		representations.stream().map(this::buildIncomingFile).forEach(builder::representation);
-		var result = builder.build();
-
-		return result.toBuilder().numberOfRepresentations(result.getRepresentations().size()).build();
+		return builder.numberOfRepresentations(representations.size()).build();
 	}
 
 	FormData addAttachments(Collection<MultipartFile> attachments, FormData formData) {
diff --git a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java
index 97518cade79823016fbf2349955a8fe1d5062d2b..5d1515ab2e9d1b8b2d765e1e16408273803fc3da 100644
--- a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java
+++ b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java
@@ -137,6 +137,13 @@ class EntryControllerTest {
 				assertThat(formData.getRepresentations()).hasSize(2);
 			}
 
+			@Test
+			void shouldSetNumberOfRepresentations() {
+				var formData = doPostRequest();
+
+				assertThat(formData.getNumberOfRepresentations()).isEqualTo(2);
+			}
+
 			@SneakyThrows
 			private FormData doPostRequest() {
 				mockMvc.perform(multipart("/antrag")