diff --git a/src/app/modules/main/wallet_section/overview/module.nim b/src/app/modules/main/wallet_section/overview/module.nim
index 1543ed9eb4..6ae66ccef8 100644
--- a/src/app/modules/main/wallet_section/overview/module.nim
+++ b/src/app/modules/main/wallet_section/overview/module.nim
@@ -95,9 +95,11 @@ proc setBalance(self: Module, tokens: seq[WalletTokenDto]) =
 
 # TODO(alaibe): replace with filter logic
 method switchAccount*(self: Module, accountIndex: int) =
+  var walletAccount = self.controller.getWalletAccount(accountIndex)
   self.currentAccountIndex = accountIndex
-
-  let walletAccount = self.controller.getWalletAccount(accountIndex)
+  if walletAccount.isNil:
+    self.currentAccountIndex = 0
+    walletAccount = self.controller.getWalletAccount(self.currentAccountIndex)
 
   let item = initItem(
     walletAccount.name,
@@ -133,4 +135,5 @@ proc onAccountAdded(self: Module, account: WalletAccountDto) =
   self.switchAccount(self.currentAccountIndex)
 
 proc onAccountRemoved(self: Module, account: WalletAccountDto) =
-  self.switchAccount(self.currentAccountIndex)
\ No newline at end of file
+  self.switchAccount(self.currentAccountIndex)
+  
\ No newline at end of file