diff --git a/src/router.ts b/src/router.ts
index c8dca76..38dec1e 100755
--- a/src/router.ts
+++ b/src/router.ts
@@ -156,8 +156,6 @@ export async function init(): Promise<void> {
     // We connect to all relays now
     await services.connectAllRelays();
 
-    await services.updateDeviceBlockHeight();
-
     // We register all the event listeners if we run in an iframe
     if (window.self !== window.top) {
       await registerAllListeners();
diff --git a/src/services/service.ts b/src/services/service.ts
index fc23c44..5e67fb9 100755
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -1369,6 +1369,7 @@ export default class Services {
       console.log('handshakeMsg:', handshakeMsg);
       this.currentBlockHeight = handshakeMsg.chain_tip;
       console.log('this.currentBlockHeight:', this.currentBlockHeight);
+      this.updateDeviceBlockHeight();
       if (this.membersList && Object.keys(this.membersList).length === 0) {
         // We start from an empty list, just copy it over
         this.membersList = handshakeMsg.peers_list;