diff --git a/internal/modules/production/recordings/services/recording.service.go b/internal/modules/production/recordings/services/recording.service.go
index 810e2aae..a83c1128 100644
--- a/internal/modules/production/recordings/services/recording.service.go
+++ b/internal/modules/production/recordings/services/recording.service.go
@@ -804,14 +804,10 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
 		return fmt.Errorf("getFeedUsageInGrams: %w", err)
 	}
 
-	fcrId, err := s.Repository.GetFcrID(tx, recording.ProjectFlockKandangId)
-	if err != nil {
-		return fmt.Errorf("getFcrID: %w", err)
-	}
-
 	currentAvgGrams := recordingutil.ToGrams(currentAvgWeight)
 	currentAvgKg := recordingutil.GramsToKg(currentAvgGrams)
 	prevAvgGrams := recordingutil.ToGrams(prevAvgWeight)
+	prevAvgKg := recordingutil.GramsToKg(prevAvgGrams)
 
 	currentDepletion := float64(totalDepletionQty)
 	cumDepletionQty := prevCumDepletionQty + currentDepletion
@@ -821,9 +817,10 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
 	}
 	recording.TotalDepletionQty = &cumDepletionQty
 
+	var remainingChick float64
 	if totalChick > 0 {
 		totalChickFloat := float64(totalChick)
-		remainingChick := totalChickFloat - cumDepletionQty
+		remainingChick = totalChickFloat - cumDepletionQty
 		if remainingChick < 0 {
 			remainingChick = 0
 		}
@@ -848,24 +845,19 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
 		updates["daily_gain"] = dailyGainKg
 		recording.DailyGain = &dailyGainKg
 	} else {
-		updates["daily_gain"] = gorm.Expr("NULL")
-		recording.DailyGain = nil
+		dailyGainKg := 0.0
+		updates["daily_gain"] = dailyGainKg
+		recording.DailyGain = &dailyGainKg
 	}
 
-	if fcrId != 0 && currentAvgKg > 0 && day > 0 {
-		if fcrWeightKg, ok, err := s.Repository.GetFcrStandardWeightKg(tx, fcrId, currentAvgKg); err != nil {
-			return fmt.Errorf("getFcrStandardWeightKg: %w", err)
-		} else if ok {
-			avgDailyGain := (currentAvgKg - fcrWeightKg) / float64(day)
-			updates["avg_daily_gain"] = avgDailyGain
-			recording.AvgDailyGain = &avgDailyGain
-		} else {
-			updates["avg_daily_gain"] = gorm.Expr("NULL")
-			recording.AvgDailyGain = nil
-		}
+	if currentAvgKg > 0 && remainingChick > 0 {
+		avgDailyGain := (currentAvgKg - prevAvgKg) / remainingChick
+		updates["avg_daily_gain"] = avgDailyGain
+		recording.AvgDailyGain = &avgDailyGain
 	} else {
-		updates["avg_daily_gain"] = gorm.Expr("NULL")
-		recording.AvgDailyGain = nil
+		avgDailyGain := 0.0
+		updates["avg_daily_gain"] = avgDailyGain
+		recording.AvgDailyGain = &avgDailyGain
 	}
 
 	if usageInGrams > 0 && totalChick > 0 {