diff --git a/core/src/main/java/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
index df206018..99bda59a 100644
--- a/core/src/main/java/bisq/core/offer/OpenOfferManager.java
+++ b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
@@ -251,8 +251,9 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
         xmrWalletService.getAddressEntriesForOpenOffer().stream()
                 .filter(e -> !openOffersIdSet.contains(e.getOfferId()))
                 .forEach(e -> {
-                    log.warn("We found an outdated addressEntry for openOffer {} (openOffers does not contain that " +
+                    log.warn("We found an outdated addressEntry with context {} for openOffer {} (openOffers does not contain that " +
                                     "offer), offers.size={}",
+                            e.getContext(),
                             e.getOfferId(), openOffers.size());
                     xmrWalletService.resetAddressEntriesForOpenOffer(e.getOfferId());
                 });
@@ -579,7 +580,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
             openOffers.remove(openOffer);
             openOffer.setState(OpenOffer.State.CLOSED);
             offerBookService.removeOffer(openOffer.getOffer().getOfferPayload(),
-                    () -> log.trace("Successful removed offer"),
+                    () -> log.info("Successfully removed offer {}", offer.getId()),
                     log::error);
             requestPersistence();
         });
diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
index 7fc18cdf..8348d6b9 100644
--- a/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
+++ b/core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
@@ -41,6 +41,9 @@ public class SellerPreparePaymentReceivedMessage extends TradeTask {
             if (trade.getPayoutTxHex() != null) {
                 log.info("Seller verifying, signing, and publishing payout tx");
                 trade.verifyPayoutTx(trade.getPayoutTxHex(), true, true);
+
+                // mark address entries as available
+                processModel.getXmrWalletService().resetAddressEntriesForPendingTrade(trade.getId());
             } else {
 
                 // create unsigned payout tx