diff --git a/app/scripts/controllers/mmi-controller.js b/app/scripts/controllers/mmi-controller.js
index bfeca6a24..355d4ad27 100644
--- a/app/scripts/controllers/mmi-controller.js
+++ b/app/scripts/controllers/mmi-controller.js
@@ -641,9 +641,10 @@ export default class MMIController extends EventEmitter {
 
   async setAccountAndNetwork(origin, address, chainId) {
     await this.appStateController.getUnlockPromise(true);
+    const addressToLowerCase = address.toLowerCase();
     const selectedAddress = this.preferencesController.getSelectedAddress();
-    if (selectedAddress.toLowerCase() !== address.toLowerCase()) {
-      this.preferencesController.setSelectedAddress(address);
+    if (selectedAddress.toLowerCase() !== addressToLowerCase) {
+      this.preferencesController.setSelectedAddress(addressToLowerCase);
     }
     const selectedChainId = parseInt(
       this.networkController.state.providerConfig.chainId,
@@ -667,7 +668,7 @@ export default class MMIController extends EventEmitter {
 
     getPermissionBackgroundApiMethods(
       this.permissionController,
-    ).addPermittedAccount(origin, address);
+    ).addPermittedAccount(origin, addressToLowerCase);
 
     return true;
   }
diff --git a/ui/pages/confirm-approve/confirm-approve.js b/ui/pages/confirm-approve/confirm-approve.js
index 0faacf441..04782895c 100644
--- a/ui/pages/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirm-approve/confirm-approve.js
@@ -176,7 +176,14 @@ export default function ConfirmApprove({
   if (assetStandard === undefined) {
     return <ConfirmContractInteraction />;
   }
-  if (assetStandard === TokenStandard.ERC20) {
+
+  let tokenAllowanceImprovements = true;
+
+  ///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
+  tokenAllowanceImprovements = false;
+  ///: END:ONLY_INCLUDE_IN
+
+  if (tokenAllowanceImprovements && assetStandard === TokenStandard.ERC20) {
     return (
       <GasFeeContextProvider transaction={transaction}>
         <TransactionModalContextProvider>
@@ -224,6 +231,7 @@ export default function ConfirmApprove({
       </GasFeeContextProvider>
     );
   }
+
   return (
     <GasFeeContextProvider transaction={transaction}>
       <ConfirmTransactionBase
diff --git a/ui/selectors/institutional/selectors.js b/ui/selectors/institutional/selectors.js
index f7198a833..901102285 100644
--- a/ui/selectors/institutional/selectors.js
+++ b/ui/selectors/institutional/selectors.js
@@ -52,27 +52,42 @@ export function getCustodianIconForAddress(state, address) {
 }
 
 export function getIsCustodianSupportedChain(state) {
-  const selectedIdentity = getSelectedIdentity(state);
-  const accountType = getAccountType(state);
-  const providerConfig = getProviderConfig(state);
+  try {
+    const selectedIdentity = getSelectedIdentity(state);
+    const accountType = getAccountType(state);
+    const providerConfig = getProviderConfig(state);
 
-  const supportedChains =
-    accountType === 'custody'
-      ? getCustodyAccountSupportedChains(state, selectedIdentity.address)
-      : null;
+    if (!selectedIdentity || !accountType || !providerConfig) {
+      throw new Error('Invalid state');
+    }
 
-  return supportedChains?.supportedChains
-    ? supportedChains.supportedChains.includes(
-        hexToDecimal(providerConfig.chainId),
-      )
-    : true;
+    if (accountType !== 'custody') {
+      return true;
+    }
+
+    const supportedChains = getCustodyAccountSupportedChains(
+      state,
+      selectedIdentity.address,
+    );
+
+    if (!supportedChains || !supportedChains.supportedChains) {
+      return true;
+    }
+
+    return supportedChains.supportedChains.includes(
+      hexToDecimal(providerConfig.chainId),
+    );
+  } catch (error) {
+    console.error(error);
+    throw error;
+  }
 }
 
 export function getMMIAddressFromModalOrAddress(state) {
-  return (
-    state.appState.modal.modalState.props.address ||
-    state.metamask.selectedAddress
-  );
+  const modalAddress = state?.appState?.modal?.modalState?.props?.address;
+  const selectedAddress = state?.metamask?.selectedAddress;
+
+  return modalAddress || selectedAddress;
 }
 
 export function getMMIConfiguration(state) {