diff --git a/apps/server/trpc/routers/errand.ts b/apps/server/trpc/routers/errand.ts
index 3d550c5..29fc7ad 100644
--- a/apps/server/trpc/routers/errand.ts
+++ b/apps/server/trpc/routers/errand.ts
@@ -82,8 +82,8 @@ export function errandProcedures(publicProcedure: ProcedureBuilder) {
           // 4–5. Compute branch name with unique suffix
           const branchName = `cw/errand/${slug}-${nanoid().slice(0, 8)}`;
 
-          // 6. Resolve base branch
-          const baseBranch = input.baseBranch ?? 'main';
+          // 6. Resolve base branch (respect project's default branch)
+          const baseBranch = input.baseBranch ?? project.defaultBranch;
 
           // 7. Get project clone path and create branch
           const clonePath = await resolveClonePath(project, ctx);