diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
index 664833f36b9cf8b7fb55f2645dd16074fe423462..a6d44d0c43309ab1f751b909d66d7a2483b5e492 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
@@ -71,14 +71,12 @@ class VorgangRemoteService {
 
 	private GrpcFindVorgangRequest.Builder createFindVorgangRequestBuilder(FindVorgaengeHeaderRequestCriteria requestCriteria,
 			FilterCriteria filterCriteria) {
-		return createFindVorgangRequestBuilder(requestCriteria).setQuery(createQuery(filterCriteria)).setFilterBy(createFilterBy(filterCriteria));
-	}
-
-	private GrpcFindVorgangRequest.Builder createFindVorgangRequestBuilder(FindVorgaengeHeaderRequestCriteria requestCriteria) {
 		return GrpcFindVorgangRequest.newBuilder()
 				.setOrderBy(GrpcOrderBy.valueOf(requestCriteria.getOrderBy().name()))
 				.setLimit(requestCriteria.getLimit())
-				.setOffset(requestCriteria.getPage() * requestCriteria.getLimit());
+				.setOffset(requestCriteria.getPage() * requestCriteria.getLimit())
+				.setQuery(createQuery(filterCriteria))
+				.setFilterBy(createFilterBy(filterCriteria));
 	}
 
 	GrpcQuery createQuery(FilterCriteria filterCriteria) {