diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java
index 9ec21b4441..64903b53a1 100644
--- a/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java
+++ b/core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java
@@ -237,6 +237,7 @@ public class BuyerAsMakerProtocol extends BuyerProtocol implements MakerProtocol
                             () -> {
                                 stopTimeout();
                                 unlatchTrade();
+                                this.errorMessageHandler = null;
                                 handleTaskRunnerSuccess(sender, request);
                             },
                             errorMessage -> {
diff --git a/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java
index 5e4de05da7..a904386f9c 100644
--- a/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java
+++ b/core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java
@@ -252,8 +252,9 @@ public class BuyerAsTakerProtocol extends BuyerProtocol implements TakerProtocol
                                 ProcessPaymentAccountPayloadRequest.class)
                         .using(new TradeTaskRunner(trade,
                                 () -> {
-                                    unlatchTrade();
                                     stopTimeout();
+                                    unlatchTrade();
+                                    this.errorMessageHandler = null;
                                     handleTaskRunnerSuccess(sender, request);
                                     tradeResultHandler.handleResult(trade); // trade is initialized
                                 },
diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java
index 72979c63b4..f28edf4846 100644
--- a/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java
+++ b/core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java
@@ -237,8 +237,9 @@ public class SellerAsMakerProtocol extends SellerProtocol implements MakerProtoc
                                 MakerRemovesOpenOffer.class)
                         .using(new TradeTaskRunner(trade,
                             () -> {
-                                unlatchTrade();
                                 stopTimeout();
+                                unlatchTrade();
+                                this.errorMessageHandler = null;
                                 handleTaskRunnerSuccess(sender, request);
                             },
                             errorMessage -> {
diff --git a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java b/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java
index fb07ba4103..6dcddd96a9 100644
--- a/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java
+++ b/core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java
@@ -245,8 +245,9 @@ public class SellerAsTakerProtocol extends SellerProtocol implements TakerProtoc
                                 ProcessPaymentAccountPayloadRequest.class)
                         .using(new TradeTaskRunner(trade,
                                 () -> {
-                                    unlatchTrade();
                                     stopTimeout();
+                                    unlatchTrade();
+                                    this.errorMessageHandler = null;
                                     handleTaskRunnerSuccess(sender, request);
                                     tradeResultHandler.handleResult(trade); // trade is initialized
                                 },