diff --git a/internal/modules/production/project_flocks/dto/projectflock.dto.go b/internal/modules/production/project_flocks/dto/projectflock.dto.go
index 977aeb40..ce9be3d3 100644
--- a/internal/modules/production/project_flocks/dto/projectflock.dto.go
+++ b/internal/modules/production/project_flocks/dto/projectflock.dto.go
@@ -23,25 +23,23 @@ type ProjectFlockBaseDTO struct {
 	FlockName string `json:"flock_name"`
 }
 
-type KandangWithProjectFlockIdDTO struct {
-	Id                    uint   `json:"id"`
-	Name                  string `json:"name"`
-	Status                string `json:"status"`
-	ProjectFlockKandangId uint   `json:"project_flock_kandang_id"`
-}
-
 type ProjectFlockListDTO struct {
 	ProjectFlockBaseDTO
 	// Flock       *flockDTO.FlockBaseDTO       `json:"flock,omitempty"`
-	Area        *areaDTO.AreaBaseDTO         `json:"area,omitempty"`
-	Category    string                       `json:"category"`
-	Fcr         *fcrDTO.FcrBaseDTO           `json:"fcr,omitempty"`
-	Location    *locationDTO.LocationBaseDTO `json:"location,omitempty"`
-	Kandangs    []kandangDTO.KandangBaseDTO  `json:"kandangs,omitempty"`
-	CreatedUser *userDTO.UserBaseDTO         `json:"created_user"`
-	CreatedAt   time.Time                    `json:"created_at"`
-	UpdatedAt   time.Time                    `json:"updated_at"`
-	Approval    approvalDTO.ApprovalBaseDTO  `json:"approval"`
+	Area        *areaDTO.AreaBaseDTO           `json:"area,omitempty"`
+	Category    string                         `json:"category"`
+	Fcr         *fcrDTO.FcrBaseDTO             `json:"fcr,omitempty"`
+	Location    *locationDTO.LocationBaseDTO   `json:"location,omitempty"`
+	Kandangs    []KandangWithProjectFlockIdDTO `json:"kandangs,omitempty"`
+	CreatedUser *userDTO.UserBaseDTO           `json:"created_user"`
+	CreatedAt   time.Time                      `json:"created_at"`
+	UpdatedAt   time.Time                      `json:"updated_at"`
+	Approval    approvalDTO.ApprovalBaseDTO    `json:"approval"`
+}
+
+type KandangWithProjectFlockIdDTO struct {
+	kandangDTO.KandangBaseDTO
+	ProjectFlockKandangId uint `json:"project_flock_kandang_id"`
 }
 
 type ProjectFlockDetailDTO struct {
@@ -60,11 +58,22 @@ func ToProjectFlockListDTO(e entity.ProjectFlock) ProjectFlockListDTO {
 		createdUser = &mapped
 	}
 
-	var kandangSummaries []kandangDTO.KandangBaseDTO
+	var kandangSummaries []KandangWithProjectFlockIdDTO
 	if len(e.Kandangs) > 0 {
-		kandangSummaries = make([]kandangDTO.KandangBaseDTO, len(e.Kandangs))
+		kandangSummaries = make([]KandangWithProjectFlockIdDTO, len(e.Kandangs))
 		for i, kandang := range e.Kandangs {
-			kandangSummaries[i] = kandangDTO.ToKandangBaseDTO(kandang)
+			// Find project_flock_kandang_id dari KandangHistory
+			var pfkId uint
+			for _, kh := range e.KandangHistory {
+				if kh.KandangId == kandang.Id {
+					pfkId = kh.Id
+					break
+				}
+			}
+			kandangSummaries[i] = KandangWithProjectFlockIdDTO{
+				KandangBaseDTO:        kandangDTO.ToKandangBaseDTO(kandang),
+				ProjectFlockKandangId: pfkId,
+			}
 		}
 	}
 
diff --git a/internal/modules/production/project_flocks/repositories/projectflock.repository.go b/internal/modules/production/project_flocks/repositories/projectflock.repository.go
index bb653fe9..a8fab919 100644
--- a/internal/modules/production/project_flocks/repositories/projectflock.repository.go
+++ b/internal/modules/production/project_flocks/repositories/projectflock.repository.go
@@ -117,7 +117,9 @@ func (r *ProjectflockRepositoryImpl) withDefaultRelations(db *gorm.DB) *gorm.DB
 		Preload("Area").
 		Preload("Fcr").
 		Preload("Location").
-		Preload("Kandangs")
+		Preload("Kandangs").
+		Preload("KandangHistory").
+		Preload("KandangHistory.Kandang")
 }
 
 func (r *ProjectflockRepositoryImpl) applyQueryFilters(db *gorm.DB, params *validation.Query) *gorm.DB {