diff --git a/src/controllers/KpiGroupController.ts b/src/controllers/KpiGroupController.ts
index 39e8fc0..7d0aa85 100644
--- a/src/controllers/KpiGroupController.ts
+++ b/src/controllers/KpiGroupController.ts
@@ -87,7 +87,6 @@ export class kpiGroupController extends Controller {
     if (chkkpinameGroup) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ชื่อกลุ่มงานนี้มีอยู่ในระบบแล้ว");
     }
-
     this.kpiGroupRepository.merge(kpiGroup, requestBody);
     kpiGroup.lastUpdateUserId = request.user.sub;
     kpiGroup.lastUpdateFullName = request.user.name;
@@ -142,10 +141,16 @@ export class kpiGroupController extends Controller {
     @Query("pageSize") pageSize: number = 10,
     @Query("keyword") keyword?: string,
   ) {
+    let whereClause: any = {};
+
+    if (keyword !== undefined && keyword !== "") {
+      whereClause = {
+        where: [{ nameGroupKPI: Like(`%${keyword}%`) }],
+      };
+    }
+
     const [kpiGroup, total] = await this.kpiGroupRepository.findAndCount({
-      where: {
-        nameGroupKPI: Like(`%${keyword}%`),
-      },
+      ...whereClause,
       ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }),
     });