diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java
index 75d88e02b1..e50dc11b5e 100644
--- a/core/src/main/java/io/bitsquare/btc/WalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/WalletService.java
@@ -604,6 +604,8 @@ public class WalletService {
                     Optional<AddressEntry> addressEntryOptional = findAddressEntry(address, AddressEntry.Context.AVAILABLE);
                     if (!addressEntryOptional.isPresent())
                         addressEntryOptional = findAddressEntry(address, AddressEntry.Context.OFFER_FUNDING);
+                    if (!addressEntryOptional.isPresent())
+                        addressEntryOptional = findAddressEntry(address, AddressEntry.Context.TRADE_PAYOUT);
                     return addressEntryOptional;
                 })
                 .filter(Optional::isPresent)