diff --git a/internal/modules/closings/services/closing.service.go b/internal/modules/closings/services/closing.service.go
index 372d38fd..02942f44 100644
--- a/internal/modules/closings/services/closing.service.go
+++ b/internal/modules/closings/services/closing.service.go
@@ -743,6 +743,10 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to determine production week")
 	}
 
+	if !isGrowing && currentWeek != 0 {
+		currentWeek = currentWeek + 17
+	}
+
 	targetAverages, err := s.RecordingRepo.GetAverageTargetMetricsByProjectFlockKandangID(c.Context(), projectFlockKandangIDs[0], !isGrowing)
 	if err != nil {
 		s.Log.Errorf("Failed to calculate target metrics for project flock %d: %+v", projectFlockID, err)