diff --git a/background/lib/priceOracle.ts b/background/lib/priceOracle.ts
index 493ce39862..fce8eaa983 100644
--- a/background/lib/priceOracle.ts
+++ b/background/lib/priceOracle.ts
@@ -152,6 +152,10 @@ const getRatesForTokens = async (
     }
   }[]
 > => {
+  if (SPOT_PRICE_ORACLE_CONSTANTS[network.chainID] === undefined) {
+    return []
+  }
+
   const multicall = new ethers.Contract(
     MULTICALL_CONTRACT_ADDRESS,
     MULTICALL_ABI,
diff --git a/background/services/internal-signer/index.ts b/background/services/internal-signer/index.ts
index a612012800..cd8b2f355b 100644
--- a/background/services/internal-signer/index.ts
+++ b/background/services/internal-signer/index.ts
@@ -334,8 +334,6 @@ export default class InternalSignerService extends BaseService<Events> {
         this.#hiddenAccounts = {
           ...plainTextVault.hiddenAccounts,
         }
-
-        this.#emitInternalSigners()
       }
     }
 
@@ -347,6 +345,8 @@ export default class InternalSignerService extends BaseService<Events> {
     }
 
     this.#unlock()
+    this.#emitInternalSigners()
+
     return true
   }