diff --git a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
index e6270b5ad8ab05eeee8c8729d03aaa4e223102b2..23a14b1b0404ae6b106f272eac6998396867cc50 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
@@ -26,7 +26,6 @@ import de.itvsh.goofy.common.user.CurrentUserService;
 public class WiedervorlageCommandController {
 
 	static final String WIEDERVORLAGE_COMMANDS = "/api/wiedervorlages/{wiedervorlageId}/commands";
-	static final String NOT_SET = "-1";
 
 	@Autowired
 	private CommandByRelationController commandByRelationController;
@@ -48,7 +47,7 @@ public class WiedervorlageCommandController {
 	CreateCommand buildCommand(Wiedervorlage wiedervorlage, WiedervorlageCommand command) {
 		var commandBuilder = CreateCommand.builder()
 				.order(CommandOrder.UPDATE_ATTACHED_ITEM)
-				.relationId(NOT_SET)
+				.relationId(wiedervorlage.getVorgangId())
 				.vorgangId(wiedervorlage.getVorgangId());
 
 		switch (command.getOrder()) {
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
index 3e1834ad47c6dc23488c91e236b0717e2305228e..fc18d024974e866540fdcf6d9730e260ad22215f 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
@@ -1,6 +1,5 @@
 package de.itvsh.goofy.wiedervorlage;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -20,6 +19,8 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
+import static org.assertj.core.api.Assertions.*;
+
 import de.itvsh.goofy.common.binaryfile.BinaryFileTestFactory;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.command.CommandController.CommandByRelationController;
@@ -116,7 +117,7 @@ class WiedervorlageCommandControllerTest {
 			void shouldHaveRelationId() {
 				var command = callBuildCommand();
 
-				assertThat(command.getRelationId()).isEqualTo(WiedervorlageCommandController.NOT_SET);
+				assertThat(command.getRelationId()).isEqualTo(VorgangHeaderTestFactory.ID);
 			}
 
 			@Test