diff --git a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java
index ce0b305e922..6b9ddcbcf9e 100644
--- a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java
+++ b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java
@@ -242,14 +242,16 @@ protected void onSetupCompleted() {
                     return message;
                 });
 
-                chainHeight.set(chain.getBestChainHeight());
                 chain.addNewBestBlockListener(block -> {
-                    connectedPeers.set(peerGroup.getConnectedPeers());
-                    chainHeight.set(block.getHeight());
+                    UserThread.execute(() -> {
+                        connectedPeers.set(peerGroup.getConnectedPeers());
+                        chainHeight.set(block.getHeight());
+                    });
                 });
 
                 // Map to user thread
                 UserThread.execute(() -> {
+                    chainHeight.set(chain.getBestChainHeight());
                     addressEntryList.onWalletReady(walletConfig.btcWallet());
                     timeoutTimer.stop();
                     setupCompletedHandlers.forEach(Runnable::run);