diff --git a/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java b/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java
index d9745ded2..c00b592fb 100644
--- a/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java
+++ b/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java
@@ -157,6 +157,48 @@ final class ChargesApiResourceSwagger {
 
         @Schema(example = "Loan service fee(changed)")
         public String name;
+        @Schema(example = "1")
+        public Integer chargeAppliesTo;
+        @Schema(example = "USD")
+        public String currencyCode;
+        @Schema(example = "en")
+        public String locale;
+        @Schema(example = "230.56")
+        public Double amount;
+        @Schema(example = "1")
+        public Integer chargeTimeType;
+        @Schema(example = "1")
+        public Integer chargeCalculationType;
+        @Schema(example = "1")
+        public Integer chargePaymentMode;
+        @Schema(example = "true")
+        public boolean active;
+        @Schema(example = "false")
+        public boolean penalty;
+        @Schema(example = "dd MMMM")
+        public String monthDayFormat;
+        @Schema(example = "01 March")
+        public String feeOnMonthDay;
+        @Schema(example = "1")
+        public Integer feeInterval;
+        @Schema(example = "1")
+        public String feeFrequency;
+        @Schema(example = "1")
+        public Integer freeWithdrawalFrequency;
+        @Schema(example = "10")
+        public Integer restartCountFrequency;
+        @Schema(example = "1")
+        public Integer countFrequencyType;
+        @Schema(example = "true")
+        public boolean enableFreeWithdrawalCharge;
+        @Schema(example = "true")
+        public boolean enablePaymentType;
+        @Schema(example = "1")
+        public Long paymentTypeId;
+        @Schema(example = "10.0")
+        public Double minCap;
+        @Schema(example = "120.0")
+        public Double maxCap;
     }
 
     @Schema(description = "PutChargesChargeIdResponse")
diff --git a/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java b/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java
index c5b17c36f..54092548b 100644
--- a/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java
+++ b/fineract-charge/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeCalculationType.java
@@ -24,8 +24,8 @@ public enum ChargeCalculationType {
     FLAT(1, "chargeCalculationType.flat"), //
     PERCENT_OF_AMOUNT(2, "chargeCalculationType.percent.of.amount"), //
     PERCENT_OF_AMOUNT_AND_INTEREST(3, "chargeCalculationType.percent.of.amount.and.interest"), //
-    PERCENT_OF_INTEREST(4, "chargeCalculationType.percent.of.interest"), PERCENT_OF_DISBURSEMENT_AMOUNT(5,
-            "chargeCalculationType.percent.of.disbursement.amount");
+    PERCENT_OF_INTEREST(4, "chargeCalculationType.percent.of.interest"), //
+    PERCENT_OF_DISBURSEMENT_AMOUNT(5, "chargeCalculationType.percent.of.disbursement.amount");
 
     private final Integer value;
     private final String code;
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
index abf89be14..e41fc9f64 100644
--- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
+++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
@@ -307,7 +307,8 @@ public class LoanTransaction extends AbstractAuditableWithUTCDateTimeCustom<Long
                 loanTransaction.feeChargesPortion, loanTransaction.penaltyChargesPortion, loanTransaction.overPaymentPortion,
                 loanTransaction.reversed, loanTransaction.paymentDetail, loanTransaction.externalId);
 
-        if (LoanTransactionType.CHARGE_PAYMENT.equals(loanTransaction.getTypeOf())) {
+        if (LoanTransactionType.CHARGE_PAYMENT.equals(loanTransaction.getTypeOf())
+                || LoanTransactionType.REPAYMENT_AT_DISBURSEMENT.equals(loanTransaction.getTypeOf())) {
             newTransaction.getLoanChargesPaid().addAll(loanTransaction.getLoanChargesPaid());
         }
         if (LoanTransactionType.REAGE.equals(loanTransaction.getTypeOf())) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
index b6a6ddf29..5b7440d21 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
@@ -1225,8 +1225,8 @@ final class LoansApiResourceSwagger {
 
             private PostLoansDisbursementData() {}
 
-            @Schema(example = "[2013, 11, 1]")
-            public LocalDate expectedDisbursementDate;
+            @Schema(example = "1 November 2023")
+            public String expectedDisbursementDate;
             @Schema(example = "1000.00")
             public Double principal;
         }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java
index cbeea9a55..6f205005f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeAssembler.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.domain.ExternalId;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
@@ -142,34 +143,46 @@ public class LoanChargeAssembler {
                                     expectedDisbursementDate = this.fromApiJsonHelper.extractLocalDateNamed(
                                             LoanApiConstants.expectedDisbursementDateParameterName, disbursementDataElement, dateFormat,
                                             locale);
+                                } else {
+                                    expectedDisbursementDate = this.fromApiJsonHelper
+                                            .extractLocalDateNamed(LoanApiConstants.expectedDisbursementDateParameterName, element);
                                 }
                             }
 
                             if (ChargeTimeType.DISBURSEMENT.getValue().equals(chargeDefinition.getChargeTimeType())) {
-                                for (LoanDisbursementDetails disbursementDetail : disbursementDetails) {
-                                    LoanTrancheDisbursementCharge loanTrancheDisbursementCharge = null;
-                                    if (chargeDefinition.isPercentageOfApprovedAmount()
-                                            && disbursementDetail.expectedDisbursementDateAsLocalDate().equals(expectedDisbursementDate)) {
-                                        final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition, principal, amount, chargeTime,
-                                                chargeCalculation, dueDate, chargePaymentModeEnum, numberOfRepayments, externalId);
-                                        loanCharges.add(loanCharge);
-                                        if (loanCharge.isTrancheDisbursementCharge()) {
-                                            loanTrancheDisbursementCharge = new LoanTrancheDisbursementCharge(loanCharge,
-                                                    disbursementDetail);
-                                            loanCharge.updateLoanTrancheDisbursementCharge(loanTrancheDisbursementCharge);
-                                        }
-                                    } else {
-                                        if (disbursementDetail.expectedDisbursementDateAsLocalDate().equals(expectedDisbursementDate)) {
-                                            final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition,
-                                                    disbursementDetail.principal(), amount, chargeTime, chargeCalculation,
-                                                    disbursementDetail.expectedDisbursementDateAsLocalDate(), chargePaymentModeEnum,
-                                                    numberOfRepayments, externalId);
+                                if (CollectionUtils.isEmpty(disbursementDetails)) {
+                                    // non-tranche
+                                    final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition, principal, amount, chargeTime,
+                                            chargeCalculation, dueDate, chargePaymentModeEnum, numberOfRepayments, externalId);
+                                    loanCharges.add(loanCharge);
+                                } else {
+                                    // tranche
+                                    for (LoanDisbursementDetails disbursementDetail : disbursementDetails) {
+                                        LoanTrancheDisbursementCharge loanTrancheDisbursementCharge = null;
+                                        if (chargeDefinition.isPercentageOfApprovedAmount() && disbursementDetail
+                                                .expectedDisbursementDateAsLocalDate().equals(expectedDisbursementDate)) {
+                                            final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition, principal, amount,
+                                                    chargeTime, chargeCalculation, dueDate, chargePaymentModeEnum, numberOfRepayments,
+                                                    externalId);
                                             loanCharges.add(loanCharge);
                                             if (loanCharge.isTrancheDisbursementCharge()) {
                                                 loanTrancheDisbursementCharge = new LoanTrancheDisbursementCharge(loanCharge,
                                                         disbursementDetail);
                                                 loanCharge.updateLoanTrancheDisbursementCharge(loanTrancheDisbursementCharge);
                                             }
+                                        } else {
+                                            if (disbursementDetail.expectedDisbursementDateAsLocalDate().equals(expectedDisbursementDate)) {
+                                                final LoanCharge loanCharge = createNewWithoutLoan(chargeDefinition,
+                                                        disbursementDetail.principal(), amount, chargeTime, chargeCalculation,
+                                                        disbursementDetail.expectedDisbursementDateAsLocalDate(), chargePaymentModeEnum,
+                                                        numberOfRepayments, externalId);
+                                                loanCharges.add(loanCharge);
+                                                if (loanCharge.isTrancheDisbursementCharge()) {
+                                                    loanTrancheDisbursementCharge = new LoanTrancheDisbursementCharge(loanCharge,
+                                                            disbursementDetail);
+                                                    loanCharge.updateLoanTrancheDisbursementCharge(loanTrancheDisbursementCharge);
+                                                }
+                                            }
                                         }
                                     }
                                 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
index a29bac9bc..fc0b8345b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -399,6 +399,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
                         txnExternalId, loan.getTotalOverpaidAsMoney());
                 disbursementTransaction.updateLoan(loan);
                 loan.addLoanTransaction(disbursementTransaction);
+                loanTransactionRepository.saveAndFlush(disbursementTransaction);
             }
             if (loan.getRepaymentScheduleInstallments().isEmpty()) {
                 /*
@@ -425,10 +426,6 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
                 loanAccrualsProcessingService.processIncomePostingAndAccruals(loan);
             }
 
-            if (disbursementTransaction != null) {
-                loanTransactionRepository.saveAndFlush(disbursementTransaction);
-            }
-
             if (loan.isAutoRepaymentForDownPaymentEnabled() && !isWithoutAutoPayment) {
                 // updating linked savings account for auto down payment transaction for disbursement to savings account
                 if (isAccountTransfer && loan.shouldCreateStandingInstructionAtDisbursement()) {
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ProgressiveLoanUndoDisbursementTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ProgressiveLoanUndoDisbursementTest.java
new file mode 100644
index 000000000..e7859897c
--- /dev/null
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ProgressiveLoanUndoDisbursementTest.java
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.integrationtests;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import org.apache.fineract.client.models.ChargeRequest;
+import org.apache.fineract.client.models.PostChargesResponse;
+import org.apache.fineract.client.models.PostClientsResponse;
+import org.apache.fineract.client.models.PostLoanProductsResponse;
+import org.apache.fineract.client.models.PostLoansLoanIdRequest;
+import org.apache.fineract.client.models.PostLoansRequestChargeData;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ProgressiveLoanUndoDisbursementTest extends BaseLoanIntegrationTest {
+
+    @Test
+    public void testProgressiveLoanUndoDisbursementWithChargeAtDisbursement() {
+        final PostClientsResponse client = clientHelper.createClient(ClientHelper.defaultClientCreationRequest());
+
+        final AtomicReference<Long> loanIdRef = new AtomicReference<>();
+
+        final PostLoanProductsResponse loanProductsResponse = loanProductHelper.createLoanProduct(create4IProgressive());
+
+        final PostChargesResponse disbCharge = chargesHelper.createCharges(new ChargeRequest().active(true).chargeAppliesTo(1)
+                .chargeCalculationType(1).chargePaymentMode(0).chargeTimeType(1).currencyCode("EUR").amount(10.0d)
+                .name(Utils.randomStringGenerator("FEE_" + Calendar.getInstance().getTimeInMillis(), 5)).locale("en"));
+
+        runAt("01 January 2025", () -> {
+            Long loanId = applyAndApproveProgressiveLoan(client.getClientId(), loanProductsResponse.getResourceId(), "01 January 2025",
+                    430.0, 7.0, 6, l -> l.setCharges(
+                            List.of(new PostLoansRequestChargeData().chargeId(disbCharge.getResourceId()).amount(new BigDecimal("10.0")))));
+
+            loanIdRef.set(loanId);
+
+            disburseLoan(loanId, BigDecimal.valueOf(430), "01 January 2025");
+            verifyRepaymentSchedule(loanId, installment(430.0, 0.0, 10.0, 0, null, "01 January 2025"), //
+                    installment(70.63, 2.51, 73.14, false, "01 February 2025"), //
+                    installment(71.04, 2.1, 73.14, false, "01 March 2025"), //
+                    installment(71.46, 1.68, 73.14, false, "01 April 2025"), //
+                    installment(71.87, 1.27, 73.14, false, "01 May 2025"), //
+                    installment(72.29, 0.85, 73.14, false, "01 June 2025"), //
+                    installment(72.71, 0.42, 73.13, false, "01 July 2025"));
+            Assertions.assertDoesNotThrow(() -> loanTransactionHelper.undoDisbursalLoan(loanId, new PostLoansLoanIdRequest()));
+        });
+    }
+}