diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
index ea01a7c927..14ac565c26 100644
--- a/core/src/main/java/haveno/core/trade/TradeManager.java
+++ b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -496,6 +496,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                 }
 
                 // freeze or thaw outputs
+                if (isShutDownStarted) return;
                 xmrWalletService.fixReservedOutputs();
 
                 // reset any available funded address entries