diff --git a/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java b/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java
index 2d65c55c35..ce3e9e8f11 100644
--- a/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java
@@ -23,7 +23,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -37,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static protobuf.OfferDirection.BUY;
 
-@Disabled
+// @Disabled
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class BsqSwapOfferTest extends AbstractOfferTest {
@@ -112,8 +111,7 @@ public class BsqSwapOfferTest extends AbstractOfferTest {
         var bsqSwapOffer = aliceClient.createBsqSwapOffer(BUY.name(),
                 1_000_000L,
                 1_000_000L,
-                "0.00005",
-                alicesBsqSwapAcct.getId());
+                "0.00005");
         log.debug("BsqSwap Sell BSQ (Buy BTC) OFFER:\n{}", bsqSwapOffer);
         var newOfferId = bsqSwapOffer.getId();
         assertNotEquals("", newOfferId);
diff --git a/apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java b/apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java
index fc8cb607ea..85f6f6d280 100644
--- a/apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java
@@ -84,8 +84,7 @@ public class BsqSwapTradeTest extends AbstractTradeTest {
         var mySwapOffer = aliceClient.createBsqSwapOffer(BUY.name(),
                 1_000_000L,     // 0.01 BTC
                 1_000_000L,
-                "0.00005",
-                alicesBsqSwapAcct.getId());
+                "0.00005");
         log.debug("Pending BsqSwap Sell BSQ (Buy BTC) OFFER:\n{}", toOfferTable.apply(mySwapOffer));
         var newOfferId = mySwapOffer.getId();
         assertNotEquals("", newOfferId);
diff --git a/cli/src/main/java/bisq/cli/GrpcClient.java b/cli/src/main/java/bisq/cli/GrpcClient.java
index a1e88898f5..8b218d5d23 100644
--- a/cli/src/main/java/bisq/cli/GrpcClient.java
+++ b/cli/src/main/java/bisq/cli/GrpcClient.java
@@ -145,13 +145,11 @@ public final class GrpcClient {
     public OfferInfo createBsqSwapOffer(String direction,
                                         long amount,
                                         long minAmount,
-                                        String fixedPrice,
-                                        String paymentAcctId) {
+                                        String fixedPrice) {
         return offersServiceRequest.createBsqSwapOffer(direction,
                 amount,
                 minAmount,
-                fixedPrice,
-                paymentAcctId);
+                fixedPrice);
     }
 
     public OfferInfo createFixedPricedOffer(String direction,
diff --git a/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java b/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java
index 273d95073f..7fd32e1a91 100644
--- a/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java
+++ b/cli/src/main/java/bisq/cli/request/OffersServiceRequest.java
@@ -73,14 +73,12 @@ public class OffersServiceRequest {
     public OfferInfo createBsqSwapOffer(String direction,
                                         long amount,
                                         long minAmount,
-                                        String fixedPrice,
-                                        String paymentAcctId) {
+                                        String fixedPrice) {
         var request = CreateBsqSwapOfferRequest.newBuilder()
                 .setDirection(direction)
                 .setAmount(amount)
                 .setMinAmount(minAmount)
                 .setPrice(fixedPrice)
-                .setPaymentAccountId(paymentAcctId)
                 .build();
         return grpcStubs.offersService.createBsqSwapOffer(request).getBsqSwapOffer();
     }
diff --git a/proto/src/main/proto/grpc.proto b/proto/src/main/proto/grpc.proto
index d8c739bd36..ad0ca7f8b6 100644
--- a/proto/src/main/proto/grpc.proto
+++ b/proto/src/main/proto/grpc.proto
@@ -163,7 +163,6 @@ message CreateBsqSwapOfferRequest {
     uint64 amount = 2;
     uint64 minAmount = 3;
     string price = 4;
-    string paymentAccountId = 5;
 }
 
 message CreateBsqSwapOfferReply {