diff --git a/internal/modules/expenses/dto/expense.dto.go b/internal/modules/expenses/dto/expense.dto.go
index 6402f8fd..129c2e96 100644
--- a/internal/modules/expenses/dto/expense.dto.go
+++ b/internal/modules/expenses/dto/expense.dto.go
@@ -105,11 +105,9 @@ func ToExpenseBaseDTO(e *entity.Expense) ExpenseBaseDTO {
 		realizationDate = &e.RealizationDate
 	}
 
-	if len(e.Nonstocks) > 0 && e.Nonstocks[0].Kandang != nil {
-		if e.Nonstocks[0].Kandang.Location.Id != 0 {
-			mapped := locationDTO.ToLocationRelationDTO(e.Nonstocks[0].Kandang.Location)
-			location = &mapped
-		}
+	if e.Location != nil && e.Location.Id != 0 {
+		mapped := locationDTO.ToLocationRelationDTO(*e.Location)
+		location = &mapped
 	}
 
 	if e.Supplier != nil && e.Supplier.Id != 0 {
diff --git a/internal/modules/expenses/services/expense.service.go b/internal/modules/expenses/services/expense.service.go
index b4753451..20d6b568 100644
--- a/internal/modules/expenses/services/expense.service.go
+++ b/internal/modules/expenses/services/expense.service.go
@@ -30,7 +30,7 @@ type ExpenseService interface {
 	GetOne(ctx *fiber.Ctx, id uint) (*expenseDto.ExpenseDetailDTO, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*expenseDto.ExpenseDetailDTO, error)
 	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*expenseDto.ExpenseDetailDTO, error)
-	DeleteOne(ctx *fiber.Ctx, id uint) error
+	DeleteOne(ctx *fiber.Ctx, id uint64) error
 	CreateRealization(ctx *fiber.Ctx, expenseID uint, req *validation.CreateRealization) (*expenseDto.ExpenseDetailDTO, error)
 	CompleteExpense(ctx *fiber.Ctx, id uint, notes *string) (*expenseDto.ExpenseDetailDTO, error)
 	UpdateRealization(ctx *fiber.Ctx, expenseID uint, req *validation.UpdateRealization) (*expenseDto.ExpenseDetailDTO, error)
@@ -68,6 +68,7 @@ func (s expenseService) withRelations(db *gorm.DB) *gorm.DB {
 	return db.
 		Preload("CreatedUser").
 		Preload("Supplier").
+		Preload("Location").
 		Preload("Nonstocks.Nonstock").
 		Preload("Nonstocks.Realization").
 		Preload("Nonstocks.ProjectFlockKandang.Kandang.Location").
@@ -621,14 +622,15 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	return responseDTO, nil
 }
 
-func (s expenseService) DeleteOne(c *fiber.Ctx, id uint) error {
+func (s expenseService) DeleteOne(c *fiber.Ctx, id uint64) error {
+	idUint := uint(id)
 
 	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Expense", ID: &id, Exists: s.Repository.IdExists},
+		commonSvc.RelationCheck{Name: "Expense", ID: &idUint, Exists: s.Repository.IdExists},
 	); err != nil {
 		return err
 	}
-	expense, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+	expense, err := s.Repository.GetByID(c.Context(), idUint, func(db *gorm.DB) *gorm.DB {
 		return db.Preload("Nonstocks")
 	})
 	if err != nil {
@@ -643,7 +645,7 @@ func (s expenseService) DeleteOne(c *fiber.Ctx, id uint) error {
 	if err := s.ensureProjectFlockNotClosedForExpense(c.Context(), expense); err != nil {
 		return err
 	}
-	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
+	if err := s.Repository.DeleteOne(c.Context(), idUint); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			s.Log.Errorf("Expense not found for ID %d: %+v", id, err)
 			return fiber.NewError(fiber.StatusNotFound, "Expense not found")