diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
index a4a1325bb141a6bdc8c86966ed92b5413ebd2df8..11ee02a8f99dc649ec533afcafbb1a75a32c4299 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
@@ -15,8 +15,8 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
 class KommentarRemoteService {
+	static final String ITEM_NAME = "Kommentar";
 
-	public static final String ITEM_NAME = "Kommentar";
 	@GrpcClient(GoofyServerApplication.GRPC_CLIENT)
 	private VorgangAttachedItemServiceBlockingStub vorgangAttachedItemServiceStub;
 	@Autowired
@@ -42,8 +42,8 @@ class KommentarRemoteService {
 
 	public Kommentar getById(String kommentarId) {
 		var response = vorgangAttachedItemServiceStub.getById(buildRequest(kommentarId));
-
-		return mapper.fromItemMap(grpcObjectMapper.mapFromGrpc(response.getVorgangAttachedItem().getItem()));
+		var kommentar = mapper.fromItemMap(grpcObjectMapper.mapFromGrpc(response.getVorgangAttachedItem().getItem()));
+		return kommentar.toBuilder().vorgangId(response.getVorgangAttachedItem().getVorgangId()).build();
 	}
 
 	private GrpcVorgangAttachedItemRequest buildRequest(String kommentarId) {
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 7def511e8d58b04c49b28148cd7e26fccb29eb59..18b1a5231005b66dc5ae7474ea6ff5d82abb3764 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
@@ -77,7 +77,9 @@ class KommentarCommandControllerTest {
 
 			assertThat(command).usingRecursiveComparison()
 					.ignoringFields("body", "status")
-					.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.CREATE_ATTACHED_ITEM).relationId("-1").id(null).build());
+					.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.CREATE_ATTACHED_ITEM)
+							.relationId(KommentarCommandController.NOT_SET)
+							.id(null).build());
 		}
 
 		private ResultActions doRequest() throws Exception {
@@ -129,7 +131,8 @@ class KommentarCommandControllerTest {
 
 			assertThat(command).usingRecursiveComparison()
 					.ignoringFields("body", "status")
-					.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.UPDATE_ATTACHED_ITEM).relationId("-1").id(null).build());
+					.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.UPDATE_ATTACHED_ITEM).relationId("-1").vorgangId("-1").id(null)
+							.build());
 		}
 
 		@Test