diff --git a/src/controllers/00-employment-office-controller.ts b/src/controllers/00-employment-office-controller.ts
index d73b569..22e55db 100644
--- a/src/controllers/00-employment-office-controller.ts
+++ b/src/controllers/00-employment-office-controller.ts
@@ -11,18 +11,23 @@ export class EmploymentOfficeController extends Controller {
     return await prisma.employmentOffice.findMany({
       where: {
         OR: [
-          {
-            province: {
-              district: { some: { id: districtId } },
-            },
-            district: { none: {} },
-          },
-          {
-            district: {
-              some: { districtId },
-            },
-          },
-          ...(queryOrNot(query, [{ name: query }, { nameEN: query }]) ?? []),
+          ...(districtId
+            ? [
+                {
+                  province: {
+                    district: { some: { id: districtId } },
+                  },
+                  district: { none: {} },
+                },
+                {
+                  district: {
+                    some: { districtId },
+                  },
+                },
+              ]
+            : []),
+          ...(queryOrNot(query, [{ name: { contains: query } }, { nameEN: { contains: query } }]) ??
+            []),
         ],
       },
       orderBy: [{ provinceId: "asc" }, { id: "asc" }],