diff --git a/CHANGELOG.md b/CHANGELOG.md
index da035b6c047d..e8a819529166 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.12.3]
+### Fixed
+- [MMI] Fixes an error related with a missing code fence, when the MMI build didn't have the blockaid feature ([#23516](https://github.com/MetaMask/metamask-extension/pull/23516))
+- [MMI] Fixes a bug for some custodians that don't send us the env property when connection to MMI ([#23494](https://github.com/MetaMask/metamask-extension/pull/23494))
+
 ## [11.12.2]
 ### Fixed
 - Fix transaction confirmations so that they correctly show estimated fees instead of max possible fees
@@ -4502,7 +4507,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.12.2...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.12.3...HEAD
+[11.12.3]: https://github.com/MetaMask/metamask-extension/compare/v11.12.2...v11.12.3
 [11.12.2]: https://github.com/MetaMask/metamask-extension/compare/v11.12.1...v11.12.2
 [11.12.1]: https://github.com/MetaMask/metamask-extension/compare/v11.12.0...v11.12.1
 [11.12.0]: https://github.com/MetaMask/metamask-extension/compare/v11.11.4...v11.12.0
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index 02bbb7c55df8..933e81e7df09 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -325,6 +325,7 @@ export default function createRPCMethodTrackingMiddleware({
 
       let blockaidMetricProps = {};
 
+      ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
       if (!isDisabledRPCMethod) {
         if (SIGNING_METHODS.includes(method)) {
           const securityAlertResponse =
@@ -337,6 +338,7 @@ export default function createRPCMethodTrackingMiddleware({
           });
         }
       }
+      ///: END:ONLY_INCLUDE_IF
 
       const properties = {
         ...eventProperties,
diff --git a/builds.yml b/builds.yml
index 3d282460eebd..daf251bd0a77 100644
--- a/builds.yml
+++ b/builds.yml
@@ -100,6 +100,7 @@ buildTypes:
     features:
       - build-mmi
       - snaps
+      - blockaid
     env:
       - INFURA_MMI_PROJECT_ID
       - SEGMENT_MMI_WRITE_KEY
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 6cd1fa3f0130..f78f3c0c5772 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1827,6 +1827,40 @@
         "webpack>events": true
       }
     },
+    "@metamask/ppom-validator": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/controller-utils": true,
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/ppom-validator>@metamask/base-controller": true,
+        "@metamask/ppom-validator>crypto-js": true,
+        "@metamask/ppom-validator>elliptic": true,
+        "await-semaphore": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/ppom-validator>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/ppom-validator>crypto-js": {
+      "globals": {
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
     "@metamask/ppom-validator>elliptic": {
       "packages": {
         "@metamask/ppom-validator>elliptic>brorand": true,
diff --git a/package.json b/package.json
index 749d7272c51b..2524da7ba8b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.12.2",
+  "version": "11.12.3",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js
index 90b058bc77d1..27a1edd94cea 100644
--- a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js
+++ b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js
@@ -125,8 +125,10 @@ const ConfirmAddCustodianToken = () => {
   const custodianLabel =
     connectRequest.labels?.find((label) => label.key === 'service')?.value ||
     t('custodian');
+
+  // Some custodians dont sent the "environment" inthe connect request
   const custodian = findCustodianByEnvName(
-    connectRequest.environment,
+    connectRequest.environment || custodianLabel,
     custodians,
   );