diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
index 56ab9c7c61..03475c3e75 100644
--- a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
+++ b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
@@ -1465,7 +1465,7 @@ public class XmrWalletService extends XmrWalletBase {
                     long date = localDateTime.toEpochSecond(ZoneOffset.UTC);
                     user.setWalletCreationDate(date);
                 }
-                walletHeight.set(wallet.getHeight());
+                if (wallet != null) walletHeight.set(wallet.getHeight());
                 isClosingWallet = false;
             }