diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
index 4792521100..28ebf79c64 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
@@ -81,7 +81,7 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
         fillAndSortPaymentAccounts();
 
         paymentAccounts.stream()
-                .filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR"))
+                .filter(this::isXmrPaymentAccount)
                 .forEach(e -> {
                     if (!xmrAccountUsesSubAddresses(e)) {
                         XmrForm.showXmrSubAddressPopup();
@@ -98,6 +98,11 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
         }
     }
 
+    private boolean isXmrPaymentAccount(PaymentAccount paymentAccount) {
+        TradeCurrency tradeCurrency = paymentAccount.getSingleTradeCurrency();
+        return tradeCurrency != null && tradeCurrency.getCode().equals("XMR");
+    }
+
     private boolean xmrAccountUsesSubAddresses(PaymentAccount paymentAccount) {
         if (paymentAccount instanceof CryptoCurrencyAccount) {
             CryptoCurrencyAccount account = (CryptoCurrencyAccount) paymentAccount;