diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
index 25b981f5e6..5c78d61b1d 100644
--- a/core/src/main/java/haveno/core/trade/TradeManager.java
+++ b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -1157,11 +1157,13 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
     }
 
     public List<Trade> getAllTrades() {
-        List<Trade> trades = new ArrayList<Trade>();
-        trades.addAll(tradableList.getList());
-        trades.addAll(closedTradableManager.getClosedTrades());
-        trades.addAll(failedTradesManager.getObservableList());
-        return trades;
+        synchronized (tradableList) {
+            List<Trade> trades = new ArrayList<Trade>();
+            trades.addAll(tradableList.getList());
+            trades.addAll(closedTradableManager.getClosedTrades());
+            trades.addAll(failedTradesManager.getObservableList());
+            return trades;
+        }
     }
 
     public List<Trade> getOpenTrades() {
diff --git a/desktop/src/main/java/haveno/desktop/main/MainViewModel.java b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java
index 08a6603d2d..4191011273 100644
--- a/desktop/src/main/java/haveno/desktop/main/MainViewModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java
@@ -217,7 +217,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
             if (newValue) {
                 tradeManager.applyTradePeriodState();
 
-                tradeManager.getObservableList().forEach(trade -> {
+                tradeManager.getOpenTrades().forEach(trade -> {
 
                     // check initialization error
                     if (trade.getInitError() != null) {