diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java b/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java
index 7b46c9a..c5e8d36 100644
--- a/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java
+++ b/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java
@@ -99,14 +99,16 @@ public void accept(
     public void openWorkers() {
 
         // fetch all usertasks spawned
-        workers.add(
-                client
-                        .newWorker()
-                        .jobType("io.camunda.zeebe:userTask")
-                        .handler(userTaskHandler)
-                        .timeout(Integer.MAX_VALUE) // user-tasks are not fetched more than once
-                        .name(workerId)
-                        .tenantIds(userTaskTenantIds.stream().toList()));
+        if(!userTaskTenantIds.isEmpty()){
+            workers.add(
+                    client
+                            .newWorker()
+                            .jobType("io.camunda.zeebe:userTask")
+                            .handler(userTaskHandler)
+                            .timeout(Integer.MAX_VALUE) // user-tasks are not fetched more than once
+                            .name(workerId)
+                            .tenantIds(userTaskTenantIds.stream().toList()));
+        }
 
         workers
                 .forEach(JobWorkerBuilderStep3::open);