diff --git a/core/src/main/java/bisq/core/btc/model/AddressEntry.java b/core/src/main/java/bisq/core/btc/model/AddressEntry.java
index fe73686d9ca..18bb07fcc28 100644
--- a/core/src/main/java/bisq/core/btc/model/AddressEntry.java
+++ b/core/src/main/java/bisq/core/btc/model/AddressEntry.java
@@ -204,6 +204,10 @@ public Address getAddress() {
         return address;
     }
 
+    public boolean isAddressNull() {
+        return address == null;
+    }
+
     public boolean isOpenOffer() {
         return context == Context.OFFER_FUNDING || context == Context.RESERVED_FOR_TRADE;
     }
diff --git a/core/src/main/java/bisq/core/btc/model/AddressEntryList.java b/core/src/main/java/bisq/core/btc/model/AddressEntryList.java
index 3453ab43dce..be9dd78fb4b 100644
--- a/core/src/main/java/bisq/core/btc/model/AddressEntryList.java
+++ b/core/src/main/java/bisq/core/btc/model/AddressEntryList.java
@@ -118,7 +118,7 @@ public void onWalletReady(Wallet wallet) {
                     Address addressFromKey = Address.fromKey(Config.baseCurrencyNetworkParameters(), keyFromPubHash,
                             scriptType);
                     // We want to ensure key and address matches in case we have address in entry available already
-                    if (addressEntry.getAddress() == null || addressFromKey.equals(addressEntry.getAddress())) {
+                    if (addressEntry.isAddressNull() || addressFromKey.equals(addressEntry.getAddress())) {
                         addressEntry.setDeterministicKey(keyFromPubHash);
                     } else {
                         log.error("We found an address entry without key but cannot apply the key as the address " +