diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java
index b9040667714e68b01695b0ee0290d02d29e6b3cf..9abe64320c10e549c535c38a1676c30123d21679 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java
@@ -24,7 +24,6 @@ import de.itvsh.goofy.common.user.CurrentUserService;
 public class KommentarCommandController {
 
 	static final String KOMMENTAR_COMMANDS = "/api/kommentars/{kommentarId}/commands";
-	static final String NOT_SET = "-1";
 
 	@Autowired
 	private KommentarService service;
@@ -46,7 +45,7 @@ public class KommentarCommandController {
 	CreateCommand buildCommand(Kommentar kommentar, KommentarCommand command) {
 		var commandBuilder = CreateCommand.builder()
 				.order(CommandOrder.UPDATE_ATTACHED_ITEM)
-				.relationId(NOT_SET)
+				.relationId(kommentar.getId())
 				.vorgangId(kommentar.getVorgangId());
 
 		return commandBuilder.body(updateKommandByCommand(kommentar, command)).build();
@@ -79,7 +78,7 @@ public class KommentarCommandController {
 			return CreateCommand.builder()
 					.vorgangId(vorgangId)
 					.order(CommandOrder.CREATE_ATTACHED_ITEM)
-					.relationId(NOT_SET)
+					.relationId(vorgangId)
 					.body(buildBody(command.getKommentar()))
 					.build();
 		}
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 23a14b1b0404ae6b106f272eac6998396867cc50..2121d9f584139667a88122fbd92d27303a0f15cc 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
@@ -47,7 +47,7 @@ public class WiedervorlageCommandController {
 	CreateCommand buildCommand(Wiedervorlage wiedervorlage, WiedervorlageCommand command) {
 		var commandBuilder = CreateCommand.builder()
 				.order(CommandOrder.UPDATE_ATTACHED_ITEM)
-				.relationId(wiedervorlage.getVorgangId())
+				.relationId(wiedervorlage.getId())
 				.vorgangId(wiedervorlage.getVorgangId());
 
 		switch (command.getOrder()) {
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java
index 3eb84c3ec6ae60f487ba067875086369004b81bc..ce15b286152a05443bf49b7168582bc0ab8cca7c 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java
@@ -1,7 +1,6 @@
 package de.itvsh.goofy.kommentar;
 
 import static de.itvsh.goofy.kommentar.KommentarCommandTestFactory.*;
-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.*;
@@ -21,6 +20,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.command.CommandController.CommandByRelationController;
 import de.itvsh.goofy.common.command.CommandOrder;
 import de.itvsh.goofy.common.command.CommandTestFactory;
@@ -78,7 +79,7 @@ class KommentarCommandControllerTest {
 			assertThat(command).usingRecursiveComparison()
 					.ignoringFields("body", "status")
 					.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.CREATE_ATTACHED_ITEM)
-							.relationId(KommentarCommandController.NOT_SET)
+							.relationId(VorgangHeaderTestFactory.ID)
 							.id(null).build());
 		}
 
@@ -132,7 +133,8 @@ class KommentarCommandControllerTest {
 			assertThat(command).usingRecursiveComparison()
 					.ignoringFields("body", "status")
 					.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.UPDATE_ATTACHED_ITEM)
-							.relationId(KommentarCommandController.NOT_SET).id(null)
+							.relationId(KommentarTestFactory.ID)
+							.id(null)
 							.build());
 		}
 
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 fc18d024974e866540fdcf6d9730e260ad22215f..7ae31ed1e022895d5021b0fcd3bdcc92f579a5ef 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
@@ -117,7 +117,7 @@ class WiedervorlageCommandControllerTest {
 			void shouldHaveRelationId() {
 				var command = callBuildCommand();
 
-				assertThat(command.getRelationId()).isEqualTo(VorgangHeaderTestFactory.ID);
+				assertThat(command.getRelationId()).isEqualTo(WiedervorlageTestFactory.ID);
 			}
 
 			@Test