diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
index 374b62cd6e..d3f9c7f357 100644
--- a/core/src/main/java/haveno/core/trade/Trade.java
+++ b/core/src/main/java/haveno/core/trade/Trade.java
@@ -795,7 +795,7 @@ public abstract class Trade implements Tradable, Model {
     }
 
     private String getWalletName() {
-        return MONERO_TRADE_WALLET_PREFIX + getId();
+        return MONERO_TRADE_WALLET_PREFIX + getShortId() + "_" + getShortUid();
     }
 
     public void checkAndVerifyDaemonConnection() {
@@ -1894,6 +1894,10 @@ public abstract class Trade implements Tradable, Model {
         return offer.getShortId();
     }
 
+    public String getShortUid() {
+        return Utilities.getShortId(getUid());
+    }
+
     public BigInteger getFrozenAmount() {
         BigInteger sum = BigInteger.ZERO;
         for (String keyImage : getSelf().getReserveTxKeyImages()) {