diff --git a/internal/modules/closings/services/closingKeuangan.service.go b/internal/modules/closings/services/closingKeuangan.service.go
index ffb7dbf4..0f3351f7 100644
--- a/internal/modules/closings/services/closingKeuangan.service.go
+++ b/internal/modules/closings/services/closingKeuangan.service.go
@@ -146,7 +146,7 @@ func (s closingKeuanganService) GetClosingKeuanganByKandang(c *fiber.Ctx, projec
 func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFlock *entity.ProjectFlock, budgets []entity.ProjectBudget, kandangs []entity.ProjectFlockKandang, scopeID uint) (*dto.ClosingKeuanganData, error) {
 	// Define flag filters using constants
 	pakanFilters := []string{string(utils.FlagPakan), string(utils.FlagPreStarter), string(utils.FlagStarter), string(utils.FlagFinisher)}
-	ovkFilters := []string{string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia), string(utils.FlagEkspedisi)}
+	ovkFilters := []string{string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia)}
 	ayamFilters := []string{string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer)}
 	allFilters := append(pakanFilters, ovkFilters...)
 	allFilters = append(allFilters, ayamFilters...)
@@ -336,7 +336,7 @@ func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFl
 
 	// Budget per category
 	budgetPakan := calculateBudgetByFlag([]string{"PAKAN", "PRE-STARTER", "STARTER", "FINISHER"})
-	budgetOvk := calculateBudgetByFlag([]string{"OVK", "OBAT", "VITAMIN", "KIMIA", "EKSPEDISI"})
+	budgetOvk := calculateBudgetByFlag([]string{"OVK", "OBAT", "VITAMIN", "KIMIA"})
 	budgetAyam := calculateBudgetByFlag([]string{"DOC", "PULLET", "LAYER"})
 	budgetEkspedisi := calculateBudgetByFlag([]string{"EKSPEDISI"})
 
@@ -432,13 +432,13 @@ func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFl
 		return
 	}
 
-	// Calculate metrics for profit loss (use total population for sales)
+	// Calculate metrics for profit loss (use total population and total weight produced)
 	calculateProfitLossMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
 		if totalPopulation > 0 {
 			rpPerBird = amount / totalPopulation
 		}
-		if totalWeightSold > 0 {
-			rpPerKg = amount / totalWeightSold
+		if totalWeightProduced > 0 {
+			rpPerKg = amount / totalWeightProduced
 		}
 		return
 	}