diff --git a/lnwallet/btcwallet/btcwallet.go b/lnwallet/btcwallet/btcwallet.go
index 14f9e3d7d..58db4322e 100644
--- a/lnwallet/btcwallet/btcwallet.go
+++ b/lnwallet/btcwallet/btcwallet.go
@@ -739,29 +739,48 @@ func (b *BtcWallet) ListAddresses(name string) (
        }
 
        for _, accntDetails := range accounts {
+               scopedMgr, err := b.wallet.Manager.FetchScopedKeyManager(
+                       accntDetails.KeyScope,
+               )
+               if err != nil {
+                       return nil, err
+               }
+
                // Retrieve all addresses of an account.
-               addresses, err := b.wallet.AccountAddresses(accntDetails.AccountNumber)
+               var managedAddrs []waddrmgr.ManagedAddress
+               err = walletdb.View(
+                       b.wallet.Database(), func(tx walletdb.ReadTx) error {
+                               addrmgrNs := tx.ReadBucket(waddrmgrNamespaceKey)
+                               return scopedMgr.ForEachAccountAddress(
+                                       addrmgrNs, accntDetails.AccountNumber,
+                                       func(a waddrmgr.ManagedAddress) error {
+                                               managedAddrs = append(
+                                                       managedAddrs, a,
+                                               )
+
+                                               return nil
+                                       },
+                               )
+                       },
+               )
                if err != nil {
                        return nil, err
                }
 
                // Only consider those accounts which have addresses.
-               if len(addresses) == 0 {
+               if len(managedAddrs) == 0 {
                        continue
                }
 
-               addressProperties := make([]lnwallet.AddressProperty, len(addresses))
-
-               for idx, address := range addresses {
-                       addressInfo, err := b.wallet.AddressInfo(address)
-                       if err != nil {
-                               return nil, err
-                       }
-
-                       addressString := address.String()
+               addressProperties := make(
+                       []lnwallet.AddressProperty, len(managedAddrs),
+               )
+               for idx, managedAddr := range managedAddrs {
+                       addr := managedAddr.Address()
+                       addressString := addr.String()
                        addressProperties[idx] = lnwallet.AddressProperty{
                                Address:  addressString,
-                               Internal: addressInfo.Internal(),
+                               Internal: managedAddr.Internal(),
                                Balance:  addressBalance[addressString],
                        }
                }