diff --git a/src/haveno.test.ts b/src/haveno.test.ts
index 3494121f..d99767fd 100644
--- a/src/haveno.test.ts
+++ b/src/haveno.test.ts
@@ -128,7 +128,7 @@ const TestConfig = {
         price: undefined,                  // use market price if undefined // TODO: converted to long on backend
         paymentAccountId: undefined,
         priceMargin: 0.0,
-        minAmount: BigInt("150000000000"), // TODO: disable by default, test somewhere
+        minAmount: undefined,
         buyerSecurityDeposit: 0.15,
         awaitUnlockedBalance: false,
         triggerPrice: undefined            // TODO: fails if there is a decimal, converted to long on backend
diff --git a/src/haveno.ts b/src/haveno.ts
index 7975fe7f..678a8f09 100644
--- a/src/haveno.ts
+++ b/src/haveno.ts
@@ -990,9 +990,9 @@ class HavenoClient {
             .setBuyerSecurityDeposit(buyerSecurityDeposit)
             .setPrice(price ? price.toString() : "1.0")  // TOOD (woodser): positive price required even if using market price?
             .setUseMarketBasedPrice(price === undefined) // TODO (woodser): this field is redundant; remove from api
+            .setMinAmount(minAmount ? minAmount.toString() : amount.toString());
     if (marketPriceMargin) request.setMarketPriceMargin(marketPriceMargin);
     if (triggerPrice) request.setTriggerPrice(triggerPrice.toString());
-    if (minAmount) request.setMinAmount(minAmount.toString());
     return new Promise(function(resolve, reject) {
       that._offersClient.createOffer(request, {password: that._password}, function(err: grpcWeb.RpcError, response: CreateOfferReply) {
         if (err) reject(err);