diff --git a/web/src/features/EthWallet/hooks/useEvmChainSelection.tsx b/web/src/features/EthWallet/hooks/useEvmChainSelection.tsx
index ea180cd..7d9b790 100644
--- a/web/src/features/EthWallet/hooks/useEvmChainSelection.tsx
+++ b/web/src/features/EthWallet/hooks/useEvmChainSelection.tsx
@@ -37,7 +37,7 @@ export function useEvmChainSelection(evmChains: EvmChains) {
     null,
   );
   useEffect(() => {
-    if (selectedEvmChain && userAccount?.address) {
+    if (selectedEvmChain && selectedEvmCurrency && userAccount?.address) {
       setEvmAccountAddress(userAccount.address);
     }
   }, [userAccount.address, selectedEvmChain, selectedEvmCurrency]);
diff --git a/web/src/features/KeplrWallet/hooks/useIbcChainSelection.tsx b/web/src/features/KeplrWallet/hooks/useIbcChainSelection.tsx
index 9ebcb80..477dee9 100644
--- a/web/src/features/KeplrWallet/hooks/useIbcChainSelection.tsx
+++ b/web/src/features/KeplrWallet/hooks/useIbcChainSelection.tsx
@@ -44,7 +44,7 @@ export function useIbcChainSelection(ibcChains: IbcChains) {
   useEffect(() => {
     // make sure the address is set when
     // the address, chain, or currency change
-    if (selectedIbcChain && cosmosAddressFromWallet) {
+    if (selectedIbcChain && selectedIbcCurrency && cosmosAddressFromWallet) {
       setIbcAccountAddress(cosmosAddressFromWallet);
     }
   }, [cosmosAddressFromWallet, selectedIbcChain, selectedIbcCurrency]);