diff --git a/core/src/main/java/haveno/core/api/CoreTradesService.java b/core/src/main/java/haveno/core/api/CoreTradesService.java
index 14f10b4f00..9854167c71 100644
--- a/core/src/main/java/haveno/core/api/CoreTradesService.java
+++ b/core/src/main/java/haveno/core/api/CoreTradesService.java
@@ -47,7 +47,6 @@ import haveno.core.support.messages.ChatMessage;
 import haveno.core.support.traderchat.TradeChatSession;
 import haveno.core.support.traderchat.TraderChatManager;
 import haveno.core.trade.ClosedTradableManager;
-import haveno.core.trade.Tradable;
 import haveno.core.trade.Trade;
 import haveno.core.trade.TradeManager;
 import haveno.core.trade.TradeUtil;
@@ -223,8 +222,7 @@ class CoreTradesService {
     }
 
     private Optional<Trade> getClosedTrade(String tradeId) {
-        Optional<Tradable> tradable = closedTradableManager.getTradeById(tradeId);
-        return tradable.filter((t) -> t instanceof Trade).map(value -> (Trade) value);
+        return closedTradableManager.getTradeById(tradeId);
     }
 
     List<Trade> getTrades() {
diff --git a/core/src/main/java/haveno/core/trade/ClosedTradableManager.java b/core/src/main/java/haveno/core/trade/ClosedTradableManager.java
index 0a48fc5188..cac8e9e261 100644
--- a/core/src/main/java/haveno/core/trade/ClosedTradableManager.java
+++ b/core/src/main/java/haveno/core/trade/ClosedTradableManager.java
@@ -150,9 +150,9 @@ public class ClosedTradableManager implements PersistedDataHost {
         }
     }
 
-    public Optional<Tradable> getTradeById(String id) {
+    public Optional<Trade> getTradeById(String id) {
         synchronized (closedTradables) {
-            return closedTradables.stream().filter(e -> e instanceof Trade && e.getId().equals(id)).findFirst();
+            return getClosedTrades().stream().filter(e -> e.getId().equals(id)).findFirst();
         }
     }
 
diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
index a3cca84912..caabdb384a 100644
--- a/core/src/main/java/haveno/core/trade/TradeManager.java
+++ b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -1315,7 +1315,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
     }
 
     public Optional<Trade> getClosedTrade(String tradeId) {
-        return closedTradableManager.getClosedTrades().stream().filter(e -> e.getId().equals(tradeId)).findFirst();
+        return closedTradableManager.getTradeById(tradeId);
     }
 
     public Optional<Trade> getFailedTrade(String tradeId) {