diff --git a/common/src/main/java/de/ozgcloud/eingang/Application.java b/common/src/main/java/de/ozgcloud/eingang/Application.java
index b485b16ec31bb7ea860b4aea009c10de01abd639..781731d3b5e29bc4501e189a860e9e79ae4c6f36 100644
--- a/common/src/main/java/de/ozgcloud/eingang/Application.java
+++ b/common/src/main/java/de/ozgcloud/eingang/Application.java
@@ -27,10 +27,12 @@ import java.util.TimeZone;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = { "de.ozgcloud" })
 @EnableScheduling
+@EnableAsync
 public class Application {
 
 	public static final String ZUFI_MANAGER_GRPC_CLIENT = "zufi-manager";
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
index 5a18d7ee752e594de92066f9b2480b34371f2e39..8a1d7855a7d8d6b41b3e0e73f650dc1a9da85345 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -102,6 +103,7 @@ public class VorgangService {
 	List<String> getOrganisationsEinheitIds(FormData formData) {
 		return formData.getZustaendigeStelles().stream()
 				.map(ZustaendigeStelle::getOrganisationseinheitenId)
+				.filter(Objects::nonNull)
 				.toList();
 	}
 
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
index bd5ff001ac043671b3760e34a6921ac5c71b844e..d46aaa4dbcc5a406964d5a6bf8028441d43d599d 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
@@ -306,6 +306,19 @@ class VorgangServiceTest {
 	class TestGetOrganisationseinheitIds {
 		private final FormData preservedFormData = FormDataTestFactory.create();
 
+		@DisplayName("should filter out empty")
+		@Test
+		void shouldFilterOutEmpty() {
+			var formDataWithNullOrgId = FormDataTestFactory.createBuilder()
+					.clearZustaendigeStelles()
+					.zustaendigeStelles(List.of(ZustaendigeStelleTestFactory.createBuilder().organisationseinheitenId(null).build()))
+					.build();
+
+			var organisationseinheitIds = service.getOrganisationsEinheitIds(formDataWithNullOrgId);
+
+			assertThat(organisationseinheitIds).isEmpty();
+		}
+
 		@DisplayName("should return")
 		@Test
 		void shouldReturn() {