diff --git a/react/src/components/dashboard/coinTile/coinTileItem.js b/react/src/components/dashboard/coinTile/coinTileItem.js
index c4adf7a..7812102 100644
--- a/react/src/components/dashboard/coinTile/coinTileItem.js
+++ b/react/src/components/dashboard/coinTile/coinTileItem.js
@@ -158,6 +158,9 @@ class CoinTileItem extends React.Component {
       Store.dispatch(activeHandle());
       setTimeout(() => {
         this.autoSetActiveCoin();
+        setTimeout(() => {
+          Store.dispatch(dashboardRemoveCoin(coin));
+        }, 500);
       }, 500);
     });
   }
@@ -187,6 +190,9 @@ class CoinTileItem extends React.Component {
         Store.dispatch(activeHandle());
         setTimeout(() => {
           this.autoSetActiveCoin();
+          setTimeout(() => {
+            Store.dispatch(dashboardRemoveCoin(coin));
+          }, 500);
         }, 500);
       }
     });
@@ -237,7 +243,7 @@ class CoinTileItem extends React.Component {
             )
           );
         }
-      } else if (mode === 'spv') {
+      } else if (mode === 'spv' && this.props.Dashboard.electrumCoins[coin].pub) {
         Store.dispatch(shepherdElectrumBalance(coin, this.props.Dashboard.electrumCoins[coin].pub));
         Store.dispatch(shepherdElectrumTransactions(coin, this.props.Dashboard.electrumCoins[coin].pub));
       }
diff --git a/react/src/reducers/activeCoin.js b/react/src/reducers/activeCoin.js
index 07b1b55..1a1a10a 100644
--- a/react/src/reducers/activeCoin.js
+++ b/react/src/reducers/activeCoin.js
@@ -42,11 +42,12 @@ export function ActiveCoin(state = {
 }, action) {
   switch (action.type) {
     case DASHBOARD_REMOVE_COIN:
-      let _coins = state.coins;
-      delete _coins[action.coin];
-      return {
-        ...state,
-        coins: _coins,
+      if (state.coins && state.coins[action.coin]) {
+        delete state.coins[action.coin];
+
+        return {
+          ...state,
+        };
       }
     case DASHBOARD_ACTIVE_COIN_CHANGE:
       if (state.coins[action.coin]) {
@@ -71,6 +72,7 @@ export function ActiveCoin(state = {
         };
         let _coins = state.coins;
         _coins[state.coin] = _coinDataToStore;
+        delete _coins.undefined;
 
         return {
           ...state,