diff --git a/internal/modules/production/project_flocks/repositories/projectflock_kandang.repository.go b/internal/modules/production/project_flocks/repositories/projectflock_kandang.repository.go
index 889a95be..2d532335 100644
--- a/internal/modules/production/project_flocks/repositories/projectflock_kandang.repository.go
+++ b/internal/modules/production/project_flocks/repositories/projectflock_kandang.repository.go
@@ -117,10 +117,10 @@ func (r *projectFlockKandangRepositoryImpl) GetAllWithFilters(ctx context.Contex
 				AND "approvals"."approvable_type" = ?
 				AND LOWER("approvals"."step_name") = LOWER(?)
 				AND "approvals"."id" IN (
-					SELECT "id" FROM "approvals"
-					WHERE "approvable_id" = "project_flock_kandangs"."id"
-					AND "approvable_type" = ?
-					ORDER BY "action_at" DESC
+					SELECT "approvals"."id" FROM "approvals"
+					WHERE "approvals"."approvable_id" = "project_flock_kandangs"."id"
+					AND "approvals"."approvable_type" = ?
+					ORDER BY "approvals"."id" DESC
 					LIMIT 1
 				)
 			)
@@ -238,9 +238,9 @@ func (r *projectFlockKandangRepositoryImpl) GetByProjectFlockAndKandang(ctx cont
 func (r *projectFlockKandangRepositoryImpl) GetActiveByKandangID(ctx context.Context, kandangID uint) (*entity.ProjectFlockKandang, error) {
 	latestApprovalSubQuery := r.db.
 		Table("approvals").
-		Select("DISTINCT ON (approvable_id) approvable_id, step_name, action_at").
+		Select("DISTINCT ON (approvable_id) approvable_id, step_name, id").
 		Where("approvable_type = ?", "PROJECT_FLOCKS").
-		Order("approvable_id, action_at DESC")
+		Order("approvable_id, id DESC")
 
 	var pfkID uint
 	if err := r.db.WithContext(ctx).