diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
index 6fa413032b..74531ba129 100644
--- a/core/src/main/java/haveno/core/trade/Trade.java
+++ b/core/src/main/java/haveno/core/trade/Trade.java
@@ -394,6 +394,7 @@ public abstract class Trade implements Tradable, Model {
     @Setter
     @Nullable
     private String counterCurrencyTxId;
+    @Getter
     private final ObservableList<ChatMessage> chatMessages = FXCollections.observableArrayList();
 
     // Transient
@@ -1666,12 +1667,6 @@ public abstract class Trade implements Tradable, Model {
         throw new IllegalArgumentException("Trade is not buyer, seller, or arbitrator");
     }
 
-    public ObservableList<ChatMessage> getChatMessages() {
-        synchronized (chatMessages) {
-            return FXCollections.observableArrayList(chatMessages);
-        }
-    }
-
     public MessageState getPaymentSentMessageState() {
         if (isPaymentReceived()) return MessageState.ACKNOWLEDGED;
         if (processModel.getPaymentSentMessageStateProperty().get() == MessageState.ACKNOWLEDGED) return MessageState.ACKNOWLEDGED;
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
index 5e3b643d70..6df3a7c0a4 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
@@ -416,11 +416,13 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
     private void updateNewChatMessagesByTradeMap() {
         model.dataModel.list.forEach(t -> {
             Trade trade = t.getTrade();
-            newChatMessagesByTradeMap.put(trade.getId(),
-                    trade.getChatMessages().stream()
-                            .filter(m -> !m.isWasDisplayed())
-                            .filter(m -> !m.isSystemMessage())
-                            .count());
+            synchronized (trade.getChatMessages()) {
+                newChatMessagesByTradeMap.put(trade.getId(),
+                        trade.getChatMessages().stream()
+                                .filter(m -> !m.isWasDisplayed())
+                                .filter(m -> !m.isSystemMessage())
+                                .count());
+            }
         });
     }
 
diff --git a/desktop/src/main/java/haveno/desktop/main/shared/ChatView.java b/desktop/src/main/java/haveno/desktop/main/shared/ChatView.java
index d9152899d9..eecf326fd5 100644
--- a/desktop/src/main/java/haveno/desktop/main/shared/ChatView.java
+++ b/desktop/src/main/java/haveno/desktop/main/shared/ChatView.java
@@ -439,7 +439,7 @@ public class ChatView extends AnchorPane {
                             copyIcon.getStyleClass().addAll("icon", "copy-icon-disputes");
 
                             // TODO There are still some cell rendering issues on updates
-                            setGraphic(messageAnchorPane);
+                            UserThread.execute(() -> setGraphic(messageAnchorPane));
                         } else {
                             if (sendMsgBusyAnimation != null && sendMsgBusyAnimationListener != null)
                                 sendMsgBusyAnimation.isRunningProperty().removeListener(sendMsgBusyAnimationListener);
@@ -448,7 +448,7 @@ public class ChatView extends AnchorPane {
 
                             copyIcon.setOnMouseClicked(null);
                             messageLabel.setOnMouseClicked(null);
-                            setGraphic(null);
+                            UserThread.execute(() -> setGraphic(null));
                         }
                     }