diff --git a/src/controllers/03-customer-branch-controller.ts b/src/controllers/03-customer-branch-controller.ts
index 62f0e30..8892365 100644
--- a/src/controllers/03-customer-branch-controller.ts
+++ b/src/controllers/03-customer-branch-controller.ts
@@ -214,8 +214,10 @@ export class CustomerBranchController extends Controller {
           ? {
               registeredBranchId,
               registeredBranch: branchActiveOnlyCond(activeRegisBranchOnly),
+              ...filterStatus(activeRegisBranchOnly ? Status.ACTIVE : status),
             }
           : {
+              ...filterStatus(activeRegisBranchOnly ? Status.ACTIVE : status),
               registeredBranch: {
                 AND: { id: registeredBranchId },
                 OR: company
@@ -225,7 +227,7 @@ export class CustomerBranchController extends Controller {
             },
         customerId,
         subDistrict: zipCode ? { zipCode } : undefined,
-        ...filterStatus(status),
+        ...filterStatus(activeRegisBranchOnly ? Status.ACTIVE : status),
       },
     } satisfies Prisma.CustomerBranchWhereInput;