diff --git a/src/lib/states.js b/src/lib/states.js
index ddec75e..d4d01a3 100644
--- a/src/lib/states.js
+++ b/src/lib/states.js
@@ -426,7 +426,7 @@ const tempStore = create(
       if (environment === 'bitshares') {
         cachedAssets = assetBitshares && assetBitshares.length ? assetBitshares : [];
         nonNFTs = nonNFTBitshares && nonNFTBitshares.length ? nonNFTBitshares : [];
-      } else if (environment === 'bitshares_testnet' && bitshares_testnet && bitshares_testnet.length) {
+      } else if (environment === 'bitshares_testnet' && assetBitsharesTestnet || nonNFTBitsharesTestnet) {
         cachedAssets = assetBitsharesTestnet && assetBitsharesTestnet.length ? assetBitsharesTestnet : [];
         nonNFTs = nonNFTBitsharesTestnet && nonNFTBitsharesTestnet.length ? nonNFTBitsharesTestnet : [];
       }
@@ -485,7 +485,7 @@ const tempStore = create(
         nonNFTs = nonNFTBitshares && nonNFTBitshares.length
           ? nonNFTBitshares
           : [];
-      } else if (environment === 'bitshares_testnet' && bitshares_testnet && bitshares_testnet.length) {
+      } else if (environment === 'bitshares_testnet' && assetBitsharesTestnet || nonNFTBitsharesTestnet) {
         cachedAssets = assetBitsharesTestnet && assetBitsharesTestnet.length
           ? assetBitsharesTestnet
           : [];