diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java
index 157d7974..24638c5e 100644
--- a/core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java
+++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SendMailboxMessageTask.java
@@ -82,6 +82,7 @@ public abstract class SendMailboxMessageTask extends TradeTask {
 
                         @Override
                         public void onFault(String errorMessage) {
+                            if (processModel.getP2PService().isShutDownStarted()) return;
                             log.error("{} failed: Peer {}. tradeId={}, uid={}, errorMessage={}", message.getClass().getSimpleName(), peersNodeAddress, message.getOfferId(), message.getUid(), errorMessage);
                             SendMailboxMessageTask.this.onFault(errorMessage, message);
                         }
diff --git a/p2p/src/main/java/haveno/network/p2p/P2PService.java b/p2p/src/main/java/haveno/network/p2p/P2PService.java
index 117ed4a4..e7a81033 100644
--- a/p2p/src/main/java/haveno/network/p2p/P2PService.java
+++ b/p2p/src/main/java/haveno/network/p2p/P2PService.java
@@ -109,6 +109,8 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
 
     @Getter
     private static NodeAddress myNodeAddress;
+    @Getter
+    private boolean isShutDownStarted = false;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -192,6 +194,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
 
     private void doShutDown() {
         log.info("P2PService doShutDown started");
+        isShutDownStarted = true;
 
         if (p2PDataStorage != null) {
             p2PDataStorage.shutDown();