diff --git a/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
index d3aa6a8a14..602bb28efd 100644
--- a/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
+++ b/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
@@ -140,9 +140,10 @@ public class BuyerProtocol extends DisputeProtocol {
                                         handleTaskRunnerSuccess(event);
                                     },
                                     (errorMessage) -> {
+                                        log.warn("Error confirming payment sent, reverting state to {}, error={}", Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN, errorMessage);
+                                        trade.setState(Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
                                         handleTaskRunnerFault(event, errorMessage);
-                                    }))
-                            .withTimeout(TradeProtocol.TRADE_TIMEOUT_SECONDS))
+                                    })))
                             .run(() -> trade.advanceState(Trade.State.BUYER_CONFIRMED_PAYMENT_SENT))
                             .executeTasks(true);
                 } catch (Exception e) {
diff --git a/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
index a59cfee76f..10baf59102 100644
--- a/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
+++ b/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
@@ -136,9 +136,10 @@ public class SellerProtocol extends DisputeProtocol {
                                 handleTaskRunnerSuccess(event);
                                 resultHandler.handleResult();
                             }, (errorMessage) -> {
+                                log.warn("Error confirming payment received, reverting state to {}, error={}", Trade.State.BUYER_SENT_PAYMENT_SENT_MSG, errorMessage);
+                                trade.setState(Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
                                 handleTaskRunnerFault(event, errorMessage);
-                            }))
-                            .withTimeout(TradeProtocol.TRADE_TIMEOUT_SECONDS))
+                            })))
                             .run(() -> trade.advanceState(Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT))
                             .executeTasks(true);
                 } catch (Exception e) {