diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java index 93dc0dbd..582c0d70 100644 --- a/core/src/main/java/haveno/core/trade/Trade.java +++ b/core/src/main/java/haveno/core/trade/Trade.java @@ -836,7 +836,9 @@ public abstract class Trade implements Tradable, Model { // reset wallet refresh period after duration new Thread(() -> { GenUtils.waitFor(syncNormalDuration); - if (!isShutDown && System.currentTimeMillis() >= syncNormalStartTimeMs + syncNormalDuration) { + Long syncNormalStartTimeMsCopy = syncNormalStartTimeMs; // copy to avoid race condition + if (syncNormalStartTimeMsCopy == null) return; + if (!isShutDown && System.currentTimeMillis() >= syncNormalStartTimeMsCopy + syncNormalDuration) { syncNormalStartTimeMs = null; updateWalletRefreshPeriod(); }