diff --git a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java
index bff31fc..27e819c 100644
--- a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java
+++ b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java
@@ -58,7 +58,9 @@ public class OnboardingController {
             TenantEntity tenant = onboardingService.createTrialTenant(request.name(), request.slug(), userId);
             return ResponseEntity.status(HttpStatus.CREATED).body(TenantResponse.from(tenant));
         } catch (IllegalArgumentException e) {
-            return ResponseEntity.status(HttpStatus.CONFLICT).build();
+            return ResponseEntity.status(HttpStatus.CONFLICT).body(null);
+        } catch (IllegalStateException e) {
+            return ResponseEntity.status(HttpStatus.CONFLICT).body(null);
         }
     }
 }
diff --git a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java
index 32102e6..fb65762 100644
--- a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java
+++ b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java
@@ -41,7 +41,7 @@ public class OnboardingService {
 
         // Create tenant via the existing vendor flow (no admin user — we'll add the caller)
         UUID actorId = resolveActorId(logtoUserId);
-        var request = new CreateTenantRequest(name, slug, "LOW", null, null);
+        var request = new CreateTenantRequest(name, slug, "STARTER", null, null);
         TenantEntity tenant = vendorTenantService.createAndProvision(request, actorId);
 
         // Add the calling user to the Logto org as owner