diff --git a/core/src/main/java/bisq/core/api/CoreOffersService.java b/core/src/main/java/bisq/core/api/CoreOffersService.java
index c02b7cf1dee..252fe11a7e0 100644
--- a/core/src/main/java/bisq/core/api/CoreOffersService.java
+++ b/core/src/main/java/bisq/core/api/CoreOffersService.java
@@ -486,6 +486,8 @@ private OfferPayload getMergedOfferPayload(EditOfferValidator editOfferValidator
                 offer.getCounterCurrencyCode(),
                 offer.getPaymentMethod().getId(),
                 offer.getMakerPaymentAccountId(),
+                offer.getMaxTradeLimit().getValue(),
+                offer.getMaxTradePeriod(),
                 offer.getCountryCode(),
                 offer.getAcceptedCountryCodes(),
                 offer.getBankId(),
diff --git a/core/src/main/java/bisq/core/offer/OfferUtil.java b/core/src/main/java/bisq/core/offer/OfferUtil.java
index d13d45742f7..e93e420f892 100644
--- a/core/src/main/java/bisq/core/offer/OfferUtil.java
+++ b/core/src/main/java/bisq/core/offer/OfferUtil.java
@@ -443,8 +443,8 @@ public OfferPayload getMergedOfferPayload(OpenOffer openOffer,
                 original.isCurrencyForMakerFeeBtc(),
                 original.getBuyerSecurityDeposit(),
                 original.getSellerSecurityDeposit(),
-                original.getMaxTradeLimit(),
-                original.getMaxTradePeriod(),
+                mutableOfferPayloadFields.getMaxTradeLimit(),
+                mutableOfferPayloadFields.getMaxTradePeriod(),
                 original.isUseAutoClose(),
                 original.isUseReOpenAfterAutoClose(),
                 original.getLowerClosePrice(),
diff --git a/core/src/main/java/bisq/core/offer/bisq_v1/MutableOfferPayloadFields.java b/core/src/main/java/bisq/core/offer/bisq_v1/MutableOfferPayloadFields.java
index e0974da047f..e672a2c0ed5 100644
--- a/core/src/main/java/bisq/core/offer/bisq_v1/MutableOfferPayloadFields.java
+++ b/core/src/main/java/bisq/core/offer/bisq_v1/MutableOfferPayloadFields.java
@@ -39,6 +39,8 @@ public final class MutableOfferPayloadFields {
     private final String counterCurrencyCode;
     private final String paymentMethodId;
     private final String makerPaymentAccountId;
+    private final long maxTradeLimit;
+    private final long maxTradePeriod;
     @Nullable
     private final String countryCode;
     @Nullable
@@ -58,6 +60,8 @@ public MutableOfferPayloadFields(OfferPayload offerPayload) {
                 offerPayload.getCounterCurrencyCode(),
                 offerPayload.getPaymentMethodId(),
                 offerPayload.getMakerPaymentAccountId(),
+                offerPayload.getMaxTradeLimit(),
+                offerPayload.getMaxTradePeriod(),
                 offerPayload.getCountryCode(),
                 offerPayload.getAcceptedCountryCodes(),
                 offerPayload.getBankId(),
@@ -72,6 +76,8 @@ public MutableOfferPayloadFields(long price,
                                      String counterCurrencyCode,
                                      String paymentMethodId,
                                      String makerPaymentAccountId,
+                                     long maxTradeLimit,
+                                     long maxTradePeriod,
                                      @Nullable String countryCode,
                                      @Nullable List<String> acceptedCountryCodes,
                                      @Nullable String bankId,
@@ -84,6 +90,8 @@ public MutableOfferPayloadFields(long price,
         this.counterCurrencyCode = counterCurrencyCode;
         this.paymentMethodId = paymentMethodId;
         this.makerPaymentAccountId = makerPaymentAccountId;
+        this.maxTradeLimit = maxTradeLimit;
+        this.maxTradePeriod = maxTradePeriod;
         this.countryCode = countryCode;
         this.acceptedCountryCodes = acceptedCountryCodes;
         this.bankId = bankId;
@@ -101,6 +109,8 @@ public String toString() {
                 ", counterCurrencyCode='" + counterCurrencyCode + '\'' + "\n" +
                 ", paymentMethodId='" + paymentMethodId + '\'' + "\n" +
                 ", makerPaymentAccountId='" + makerPaymentAccountId + '\'' + "\n" +
+                ", maxTradeLimit='" + maxTradeLimit + '\'' + "\n" +
+                ", maxTradePeriod='" + maxTradePeriod + '\'' + "\n" +
                 ", countryCode='" + countryCode + '\'' + "\n" +
                 ", acceptedCountryCodes=" + acceptedCountryCodes + "\n" +
                 ", bankId='" + bankId + '\'' + "\n" +
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
index 546e7f986b7..c12bec190ab 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
@@ -148,7 +148,7 @@ protected void addAccountNameTextFieldWithAutoFillToggleButton() {
     public static InfoTextField addOpenTradeDuration(GridPane gridPane,
                                                      int gridRow,
                                                      Offer offer) {
-        long hours = offer.getMaxTradePeriod() / 3600_000;
+        long hours = offer.getPaymentMethod().getMaxTradePeriod() / 3600_000;
         final Tuple3<Label, InfoTextField, VBox> labelInfoTextFieldVBoxTuple3 =
                 addTopLabelInfoTextField(gridPane, gridRow, Res.get("payment.maxPeriod"),
                         getTimeText(hours), -Layout.FLOATING_LABEL_DISTANCE);