diff --git a/components/transaction/zksync/lite/ConfirmTransactionModal.vue b/components/transaction/zksync/lite/ConfirmTransactionModal.vue
index 8c920091..a5b83f32 100644
--- a/components/transaction/zksync/lite/ConfirmTransactionModal.vue
+++ b/components/transaction/zksync/lite/ConfirmTransactionModal.vue
@@ -22,7 +22,7 @@
       <template v-for="(item, index) in computedTransactions" :key="index">
         <CommonCardWithLineButtons>
           <AddressCardParsed
-            :address="walletAddress!"
+            :address="account.address!"
             :destination="destinations.zkSyncLite"
             :tooltip="`${getActionName(item.type)} from ${destinations.zkSyncLite.label} (L2)`"
           />
@@ -142,6 +142,7 @@ import type { PropType } from "vue";
 import type { IncomingTxFeeType } from "zksync/build/types";
 
 import { useDestinationsStore } from "@/store/destinations";
+import { useOnboardStore } from "@/store/onboard";
 import { usePreferencesStore } from "@/store/preferences";
 import { useLiteAccountActivationStore } from "@/store/zksync/lite/accountActivation";
 import { useLiteTransactionsHistoryStore } from "@/store/zksync/lite/transactionsHistory";
@@ -186,7 +187,7 @@ const props = defineProps({
 const liteTransactionsHistoryStore = useLiteTransactionsHistoryStore();
 const liteAccountActivationStore = useLiteAccountActivationStore();
 const walletLiteStore = useLiteWalletStore();
-const { walletAddress } = storeToRefs(walletLiteStore);
+const { account } = storeToRefs(useOnboardStore());
 const { destinations } = storeToRefs(useDestinationsStore());
 const { previousTransactionAddress } = storeToRefs(usePreferencesStore());
 const { status, error, transactionHashes, commitTransaction } = useTransaction(() =>
diff --git a/composables/useObservable.ts b/composables/useObservable.ts
index 8f6e664b..d7848e06 100644
--- a/composables/useObservable.ts
+++ b/composables/useObservable.ts
@@ -1,8 +1,8 @@
-type CallbackFunction = () => void;
-class Observable {
-  private subscribers: CallbackFunction[] = [];
+type CallbackFunction<T> = (param: T) => void;
+class Observable<T> {
+  private subscribers: CallbackFunction<T>[] = [];
 
-  public subscribe(callback: CallbackFunction) {
+  public subscribe(callback: CallbackFunction<T>) {
     this.subscribers.push(callback);
     const unsubscribe = () => {
       this.unsubscribe(callback);
@@ -10,22 +10,22 @@ class Observable {
     return unsubscribe;
   }
 
-  public unsubscribe(callback: CallbackFunction) {
+  public unsubscribe(callback: CallbackFunction<T>) {
     const index = this.subscribers.indexOf(callback);
     if (index !== -1) {
       this.subscribers.splice(index, 1);
     }
   }
 
-  public notify() {
+  public notify(param: T) {
     this.subscribers.forEach((callback) => {
-      callback();
+      callback(param);
     });
   }
 }
 
-export default () => {
-  const observable = new Observable();
+export default <T>() => {
+  const observable = new Observable<T>();
 
   return {
     subscribe: observable.subscribe.bind(observable),
diff --git a/pages/balances.vue b/pages/balances.vue
index ae14eab9..ed20b193 100644
--- a/pages/balances.vue
+++ b/pages/balances.vue
@@ -26,11 +26,15 @@
 </template>
 
 <script lang="ts" setup>
+import { onBeforeUnmount } from "vue";
+
 import { storeToRefs } from "pinia";
 
+import { useOnboardStore } from "@/store/onboard";
 import { useLiteWalletStore } from "@/store/zksync/lite/wallet";
 import { groupBalancesByAmount } from "@/utils/mappers";
 
+const onboardStore = useOnboardStore();
 const walletLiteStore = useLiteWalletStore();
 const { balance, balanceInProgress, balanceError, allBalancePricesLoaded } = storeToRefs(walletLiteStore);
 
@@ -40,6 +44,15 @@ const fetch = () => {
   walletLiteStore.requestBalance();
 };
 fetch();
+
+const unsubscribe = onboardStore.subscribeOnAccountChange((newAddress) => {
+  if (!newAddress) return;
+  fetch();
+});
+
+onBeforeUnmount(() => {
+  unsubscribe();
+});
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/pages/index.vue b/pages/index.vue
index 8c054a91..b649bf50 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -59,16 +59,18 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, onBeforeUnmount } from "vue";
 
 import { PaperAirplaneIcon, PlusIcon } from "@heroicons/vue/24/outline";
 import { storeToRefs } from "pinia";
 
 import { useDestinationsStore } from "@/store/destinations";
+import { useOnboardStore } from "@/store/onboard";
 import { useLiteWalletStore } from "@/store/zksync/lite/wallet";
 import { parseTokenAmount, removeSmallAmount } from "@/utils/formatters";
 import { isOnlyZeroes } from "@/utils/helpers";
 
+const onboardStore = useOnboardStore();
 const walletLiteStore = useLiteWalletStore();
 const { balance, balanceInProgress, balanceError, allBalancePricesLoaded } = storeToRefs(walletLiteStore);
 const { destinations } = storeToRefs(useDestinationsStore());
@@ -107,6 +109,15 @@ const displayedBalances = computed(() => {
     return false;
   });
 });
+
+const unsubscribe = onboardStore.subscribeOnAccountChange((newAddress) => {
+  if (!newAddress) return;
+  fetch();
+});
+
+onBeforeUnmount(() => {
+  unsubscribe();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/payments/all.vue b/pages/payments/all.vue
index 72ccaa89..a37d3316 100644
--- a/pages/payments/all.vue
+++ b/pages/payments/all.vue
@@ -61,9 +61,11 @@ import { storeToRefs } from "pinia";
 import TransactionsGroupedByBatch from "@/components/transaction/zksync/lite/TransactionsGroupedByBatch.vue";
 
 import { useDestinationsStore } from "@/store/destinations";
+import { useOnboardStore } from "@/store/onboard";
 import { useLiteTransactionsHistoryStore } from "@/store/zksync/lite/transactionsHistory";
 import { groupTransactionsByDate } from "@/utils/mappers";
 
+const onboardStore = useOnboardStore();
 const liteTransactionsHistoryStore = useLiteTransactionsHistoryStore();
 const {
   transactions,
@@ -82,7 +84,8 @@ const fetch = () => {
 };
 fetch();
 
-const unsubscribe = liteTransactionsHistoryStore.subscribeOnAccountChange(() => {
+const unsubscribe = onboardStore.subscribeOnAccountChange((newAddress) => {
+  if (!newAddress) return;
   fetch();
 });
 
diff --git a/pages/payments/index.vue b/pages/payments/index.vue
index 3ccabfc6..3c4ec4ed 100644
--- a/pages/payments/index.vue
+++ b/pages/payments/index.vue
@@ -59,8 +59,10 @@ import { storeToRefs } from "pinia";
 import ZkSyncLiteTransactionLineItem from "@/components/transaction/zksync/lite/ZkSyncLiteTransactionLineItem.vue";
 
 import { useDestinationsStore } from "@/store/destinations";
+import { useOnboardStore } from "@/store/onboard";
 import { useLiteTransactionsHistoryStore } from "@/store/zksync/lite/transactionsHistory";
 
+const onboardStore = useOnboardStore();
 const liteTransactionsHistoryStore = useLiteTransactionsHistoryStore();
 const { transactions, recentTransactionsRequestInProgress, recentTransactionsRequestError } =
   storeToRefs(liteTransactionsHistoryStore);
@@ -71,7 +73,8 @@ const fetch = () => {
 };
 fetch();
 
-const unsubscribe = liteTransactionsHistoryStore.subscribeOnAccountChange(() => {
+const unsubscribe = onboardStore.subscribeOnAccountChange((newAddress) => {
+  if (!newAddress) return;
   fetch();
 });
 
diff --git a/store/ens.ts b/store/ens.ts
index b353b414..17f3ee2f 100644
--- a/store/ens.ts
+++ b/store/ens.ts
@@ -32,7 +32,10 @@ export const useEnsStore = defineStore("ens", () => {
   };
 
   fetchName();
-  watch(() => account.value.address, fetchName);
+
+  onboardStore.subscribeOnAccountChange(() => {
+    fetchName();
+  });
 
   return {
     name: computed(() => ensName.value),
diff --git a/store/onboard.ts b/store/onboard.ts
index a26748a1..e65e08cf 100644
--- a/store/onboard.ts
+++ b/store/onboard.ts
@@ -4,6 +4,8 @@ import { EthereumClient, modalConnectors, walletConnectProvider } from "@web3mod
 import { Web3Modal } from "@web3modal/html";
 import { defineStore, storeToRefs } from "pinia";
 
+import useObservable from "@/composables/useObservable";
+
 import { useRuntimeConfig } from "#imports";
 import { chains, useNetworkStore } from "@/store/network";
 import { formatError } from "@/utils/formatters";
@@ -91,6 +93,14 @@ export const useOnboardStore = defineStore("onboard", () => {
     await switchNetwork().catch(() => undefined);
   };
 
+  const { subscribe: subscribeOnAccountChange, notify: notifyOnAccountChange } = useObservable<string | undefined>();
+  watch(
+    () => account.value.address,
+    () => {
+      notifyOnAccountChange(account.value.address);
+    }
+  );
+
   return {
     account: computed(() => account.value),
     network: computed(() => network.value),
@@ -104,5 +114,7 @@ export const useOnboardStore = defineStore("onboard", () => {
     setCorrectNetwork,
 
     getEthereumProvider: () => provider({ chainId: selectedEthereumNetwork.value.id }),
+
+    subscribeOnAccountChange,
   };
 });
diff --git a/store/zksync/lite/accountActivation.ts b/store/zksync/lite/accountActivation.ts
index 163af02d..5f399067 100644
--- a/store/zksync/lite/accountActivation.ts
+++ b/store/zksync/lite/accountActivation.ts
@@ -4,6 +4,7 @@ import { getChangePubkeyLegacyMessage, MAX_TIMESTAMP } from "zksync/build/utils"
 
 import type { PubKeyHash } from "zksync/build/types";
 
+import { useOnboardStore } from "@/store/onboard";
 import { useLiteWalletStore } from "@/store/zksync/lite/wallet";
 import { formatError } from "@/utils/formatters";
 
@@ -21,8 +22,10 @@ type AccountActivationTx = {
 };
 
 export const useLiteAccountActivationStore = defineStore("liteAccountActivation", () => {
+  const onboardStore = useOnboardStore();
   const liteWalletStore = useLiteWalletStore();
-  const { walletAddress, isAuthorized, isRemoteWallet, accountState } = storeToRefs(liteWalletStore);
+  const { account } = storeToRefs(onboardStore);
+  const { isAuthorized, isRemoteWallet, accountState } = storeToRefs(liteWalletStore);
   const storageAccountActivations = useStorage<{ [userAddress: string]: AccountActivationTx }>(
     "account-activations",
     {}
@@ -33,6 +36,7 @@ export const useLiteAccountActivationStore = defineStore("liteAccountActivation"
     inProgress: accountActivationCheckInProgress,
     execute: checkAccountActivation,
     reset: resetAccountActivation,
+    reload: reloadAccountActivation,
   } = usePromise<boolean>(async () => {
     const wallet = await liteWalletStore.getWalletInstance();
     if (!wallet) throw new Error("Wallet is not available");
@@ -58,7 +62,8 @@ export const useLiteAccountActivationStore = defineStore("liteAccountActivation"
   });
 
   const isAccountActivationSigned = computed(() => {
-    const signedActivation = storageAccountActivations.value[walletAddress.value!];
+    if (!account.value.address) return false;
+    const signedActivation = storageAccountActivations.value[account.value.address];
     if (signedActivation && !accountState.value) {
       return true;
     } else if (signedActivation && accountState.value) {
@@ -109,7 +114,7 @@ export const useLiteAccountActivationStore = defineStore("liteAccountActivation"
       accountState.id!
     );
     const ethSignature = (await wallet.ethMessageSigner().getEthMessageSignature(changePubKeyMessage)).signature;
-    storageAccountActivations.value[walletAddress.value!] = {
+    storageAccountActivations.value[account.value.address!] = {
       accountId: accountState.id!,
       account: wallet.address(),
       newPkHash: newPubKeyHash,
@@ -126,7 +131,7 @@ export const useLiteAccountActivationStore = defineStore("liteAccountActivation"
     const wallet = await liteWalletStore.getWalletInstance(true);
     if (!wallet) throw new Error("Wallet is not available");
 
-    const signedActivation = storageAccountActivations.value[walletAddress.value!];
+    const signedActivation = storageAccountActivations.value[account.value.address!];
     return await wallet.signer!.signSyncChangePubKey({
       ...signedActivation,
       fee: "0",
@@ -134,17 +139,13 @@ export const useLiteAccountActivationStore = defineStore("liteAccountActivation"
     });
   };
 
-  watch(walletAddress, (address, oldAddress) => {
-    if (address) {
-      if (oldAddress) {
-        checkAccountActivation({ force: true });
-      } else {
-        checkAccountActivation();
-      }
+  onboardStore.subscribeOnAccountChange((newAddress) => {
+    resetAccountActivationSign();
+    if (newAddress) {
+      reloadAccountActivation();
     } else {
       resetAccountActivation();
     }
-    resetAccountActivationSign();
   });
 
   return {
diff --git a/store/zksync/lite/transactionsHistory.ts b/store/zksync/lite/transactionsHistory.ts
index 3ee14e76..685787d4 100644
--- a/store/zksync/lite/transactionsHistory.ts
+++ b/store/zksync/lite/transactionsHistory.ts
@@ -1,7 +1,5 @@
 import { defineStore, storeToRefs } from "pinia";
 
-import useObservable from "@/composables/useObservable";
-
 import type { ZkSyncLiteTransaction } from "@/utils/zksync/lite/mappers";
 import type { PaginationQuery } from "zksync/build/types";
 
@@ -11,10 +9,11 @@ import { useLiteTokensStore } from "@/store/zksync/lite/tokens";
 import { mapApiTransaction } from "@/utils/zksync/lite/mappers";
 
 export const useLiteTransactionsHistoryStore = defineStore("liteTransactionsHistory", () => {
+  const onboardStore = useOnboardStore();
   const liteProviderStore = useLiteProviderStore();
   const liteTokensStore = useLiteTokensStore();
   const { tokens } = storeToRefs(liteTokensStore);
-  const { account } = storeToRefs(useOnboardStore());
+  const { account } = storeToRefs(onboardStore);
 
   const transactionsRequest = async (pagination: PaginationQuery<string>): Promise<ZkSyncLiteTransaction[]> => {
     const provider = await liteProviderStore.requestProvider();
@@ -113,18 +112,11 @@ export const useLiteTransactionsHistoryStore = defineStore("liteTransactionsHist
     { cache: false }
   );
 
-  const { subscribe: subscribeOnAccountChange, notify: notifyOnAccountChange } = useObservable();
-  subscribeOnAccountChange(() => {
+  onboardStore.subscribeOnAccountChange(() => {
     transactions.value = [];
     resetRecentTransactionsRequest();
     resetPreviousTransactionsRequest();
   });
-  watch(
-    () => account.value.address,
-    () => {
-      notifyOnAccountChange();
-    }
-  );
 
   return {
     transactions: computed<ZkSyncLiteTransaction[]>(() =>
@@ -150,7 +142,5 @@ export const useLiteTransactionsHistoryStore = defineStore("liteTransactionsHist
     previousTransactionsRequestInProgress,
     previousTransactionsRequestError,
     requestPreviousTransactions,
-
-    subscribeOnAccountChange,
   };
 });
diff --git a/store/zksync/lite/wallet.ts b/store/zksync/lite/wallet.ts
index 744e512a..ed2bd2a9 100644
--- a/store/zksync/lite/wallet.ts
+++ b/store/zksync/lite/wallet.ts
@@ -13,7 +13,7 @@ import { useNetworkStore } from "@/store/network";
 import { useOnboardStore } from "@/store/onboard";
 import { useLiteProviderStore } from "@/store/zksync/lite/provider";
 import { useLiteTokensStore, type ZkSyncLiteToken } from "@/store/zksync/lite/tokens";
-import { checksumAddress, formatError } from "@/utils/formatters";
+import { formatError } from "@/utils/formatters";
 
 export interface Balance extends ZkSyncLiteToken {
   amount: BigNumberish;
@@ -28,7 +28,6 @@ export const useLiteWalletStore = defineStore("liteWallet", () => {
   const { selectedEthereumNetwork } = storeToRefs(useNetworkStore());
 
   let wallet: Wallet | undefined = undefined;
-  const walletAddress = ref<string | undefined>(undefined);
   const isAuthorized = ref(false);
   const isRemoteWallet = ref(false);
 
@@ -99,10 +98,8 @@ export const useLiteWalletStore = defineStore("liteWallet", () => {
     }
     if (wallet) {
       isAuthorized.value = isRemoteWallet.value || wallet.syncSignerConnected();
-      walletAddress.value = checksumAddress(wallet.address());
     } else {
       isAuthorized.value = false;
-      walletAddress.value = undefined;
     }
     return wallet;
   };
@@ -164,31 +161,15 @@ export const useLiteWalletStore = defineStore("liteWallet", () => {
     { immediate: true }
   );
 
-  const reset = () => {
-    wallet = undefined;
-    walletAddress.value = undefined;
+  onboardStore.subscribeOnAccountChange(() => {
     isAuthorized.value = false;
     isRemoteWallet.value = false;
     resetWalletInstance();
     resetAccountState();
     resetBalance();
-  };
-
-  watch(account, async () => {
-    if (
-      (account.value.isConnected && !wallet) ||
-      (wallet && account.value.address && wallet.address() !== account.value.address)
-    ) {
-      reset();
-      await requestBalance();
-    } else if (account.value.isDisconnected) {
-      reset();
-    }
   });
 
   return {
-    walletAddress,
-
     isAuthorized,
     authorizationInProgress,
     authorizationError: computed(() => formatError(authorizationError.value)),
diff --git a/views/transactions/lite/Transfer.vue b/views/transactions/lite/Transfer.vue
index 5bc7bc99..7d7a8c9b 100644
--- a/views/transactions/lite/Transfer.vue
+++ b/views/transactions/lite/Transfer.vue
@@ -27,7 +27,7 @@
       :transactions="transactions"
       :button-disabled="continueButtonDisabled || !enoughBalanceForTransaction"
       :estimate="estimate"
-      :key="walletAddress"
+      :key="account.address"
     >
       <template #alerts>
         <transition v-bind="TransitionAlertScaleInOutTransition">
@@ -142,7 +142,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from "vue";
+import { computed, onBeforeUnmount, ref, watch } from "vue";
 
 import { ArrowUpRightIcon, ExclamationTriangleIcon, InformationCircleIcon } from "@heroicons/vue/24/outline";
 import { PencilIcon } from "@heroicons/vue/24/solid";
@@ -162,6 +162,7 @@ import type { PropType } from "vue";
 
 import { useRoute } from "#app";
 import { useDestinationsStore } from "@/store/destinations";
+import { useOnboardStore } from "@/store/onboard";
 import { useLiteAccountActivationStore } from "@/store/zksync/lite/accountActivation";
 import { useLiteProviderStore } from "@/store/zksync/lite/provider";
 import { useLiteTokensStore } from "@/store/zksync/lite/tokens";
@@ -186,14 +187,15 @@ const emit = defineEmits<{
 
 const route = useRoute();
 
+const onboardStore = useOnboardStore();
 const liteProviderStore = useLiteProviderStore();
 const walletLiteStore = useLiteWalletStore();
 const liteAccountActivationStore = useLiteAccountActivationStore();
 const liteTokensStore = useLiteTokensStore();
+const { account } = storeToRefs(onboardStore);
 const { destinations } = storeToRefs(useDestinationsStore());
 const { tokens } = storeToRefs(liteTokensStore);
-const { walletAddress, balance, balanceInProgress, allBalancePricesLoaded, balanceError } =
-  storeToRefs(walletLiteStore);
+const { balance, balanceInProgress, allBalancePricesLoaded, balanceError } = storeToRefs(walletLiteStore);
 const { isAccountActivated, accountActivationCheckInProgress } = storeToRefs(liteAccountActivationStore);
 
 const destination = computed(() =>
@@ -235,7 +237,7 @@ watch(allBalancePricesLoaded, (loaded) => {
 });
 
 const transactionConfirmModalOpened = ref(false);
-watch(walletAddress, () => {
+const unsubscribe = onboardStore.subscribeOnAccountChange(() => {
   transactionConfirmModalOpened.value = false;
 });
 const openConfirmationModal = () => {
@@ -311,7 +313,7 @@ const transactions = computed<ConfirmationModalTransaction[]>(() => {
 
 const estimate = async () => {
   if (
-    !walletAddress.value ||
+    !account.value.address ||
     !selectedToken.value ||
     !feeToken.value ||
     accountActivationCheckInProgress.value ||
@@ -330,10 +332,10 @@ const estimate = async () => {
         ChangePubKey: { onchainPubkeyAuth: false },
       },
       symbol: selectedToken.value.symbol,
-      to: walletAddress.value,
+      to: account.value.address,
     });
   }
-  await estimateFee(fees, walletAddress.value, feeToken.value.symbol);
+  await estimateFee(fees, account.value.address, feeToken.value.symbol);
 };
 const feeAutoUpdateEstimate = async () => {
   if (transactionConfirmModalOpened.value) {
@@ -346,7 +348,7 @@ watch(
     () => props.address,
     () => selectedToken.value?.symbol,
     () => feeToken.value?.symbol,
-    walletAddress,
+    () => account.value.address,
     isAccountActivated,
   ],
   () => {
@@ -396,6 +398,16 @@ const fetchBalances = () => {
 fetchBalances();
 
 liteAccountActivationStore.checkAccountActivation();
+
+const unsubscribeFetchBalance = onboardStore.subscribeOnAccountChange((newAddress) => {
+  if (!newAddress) return;
+  fetchBalances();
+});
+
+onBeforeUnmount(() => {
+  unsubscribe();
+  unsubscribeFetchBalance();
+});
 </script>
 
 <style lang="scss" scoped>