diff --git a/src/views/Wallet/components/SelectedAccount/index.js b/src/views/Wallet/components/SelectedAccount/index.js
index 9067b6b1..d1727dd2 100644
--- a/src/views/Wallet/components/SelectedAccount/index.js
+++ b/src/views/Wallet/components/SelectedAccount/index.js
@@ -33,7 +33,8 @@ const SelectedAccount = (props: Props) => {
         network
     } = accountState;
 
-    if (!network) return; // TODO: this shouldn't happen. change accountState reducer?
+    // corner case: accountState didn't finish loading state after LOCATION_CHANGE action
+    if (!network) return (<Notification type="info" title="Loading account state..." />); 
 
     const blockchain = props.blockchain.find(b => b.name === network.network);
     if (blockchain && !blockchain.connected) {