diff --git a/app/core/BackgroundBridge/BackgroundBridge.js b/app/core/BackgroundBridge/BackgroundBridge.js
index 78dd22aa8b79..c20eb7694127 100644
--- a/app/core/BackgroundBridge/BackgroundBridge.js
+++ b/app/core/BackgroundBridge/BackgroundBridge.js
@@ -26,8 +26,8 @@ import snapMethodMiddlewareBuilder from '../Snaps/SnapsMethodMiddleware';
 import { SubjectType } from '@metamask/permission-controller';
 ///: END:ONLY_INCLUDE_IF
 
-const createFilterMiddleware = require('eth-json-rpc-filters');
-const createSubscriptionManager = require('eth-json-rpc-filters/subscriptionManager');
+const createFilterMiddleware = require('@metamask/eth-json-rpc-filters');
+const createSubscriptionManager = require('@metamask/eth-json-rpc-filters/subscriptionManager');
 const { providerAsMiddleware } = require('eth-json-rpc-middleware');
 const pump = require('pump');
 // eslint-disable-next-line import/no-nodejs-modules
diff --git a/app/core/Snaps/SnapBridge.ts b/app/core/Snaps/SnapBridge.ts
index 2ab13fbf5d00..ae26822fc719 100644
--- a/app/core/Snaps/SnapBridge.ts
+++ b/app/core/Snaps/SnapBridge.ts
@@ -22,8 +22,8 @@ import snapMethodMiddlewareBuilder from './SnapsMethodMiddleware';
 import { SubjectType } from '@metamask/permission-controller';
 
 const ObjectMultiplex = require('@metamask/object-multiplex');
-const createFilterMiddleware = require('eth-json-rpc-filters');
-const createSubscriptionManager = require('eth-json-rpc-filters/subscriptionManager');
+const createFilterMiddleware = require('@metamask/eth-json-rpc-filters');
+const createSubscriptionManager = require('@metamask/eth-json-rpc-filters/subscriptionManager');
 const { providerAsMiddleware } = require('eth-json-rpc-middleware');
 const pump = require('pump');
 
diff --git a/package.json b/package.json
index 0682450f5416..374e22b18907 100644
--- a/package.json
+++ b/package.json
@@ -148,6 +148,7 @@
     "@metamask/contract-metadata": "^2.1.0",
     "@metamask/controller-utils": "^11.3.0",
     "@metamask/design-tokens": "^4.0.0",
+    "@metamask/eth-json-rpc-filters": "^8.0.0",
     "@metamask/eth-ledger-bridge-keyring": "^4.1.0",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/eth-sig-util": "^7.0.2",
@@ -239,7 +240,6 @@
     "eciesjs": "^0.3.15",
     "eth-block-tracker": "^7.0.1",
     "eth-ens-namehash": "2.0.8",
-    "eth-json-rpc-filters": "^6.0.1",
     "eth-json-rpc-middleware": "9.0.1",
     "eth-url-parser": "1.0.4",
     "ethereumjs-abi": "0.6.6",
diff --git a/patches/@metamask+post-message-stream+8.1.0.patch b/patches/@metamask+post-message-stream+8.1.1.patch
similarity index 95%
rename from patches/@metamask+post-message-stream+8.1.0.patch
rename to patches/@metamask+post-message-stream+8.1.1.patch
index 22d35a8aee53..1f320420ffba 100644
--- a/patches/@metamask+post-message-stream+8.1.0.patch
+++ b/patches/@metamask+post-message-stream+8.1.1.patch
@@ -1,8 +1,8 @@
 diff --git a/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js b/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js
-index cead325..a319ed7 100644
+index f2e42ef..27807bb 100644
 --- a/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js
 +++ b/node_modules/@metamask/post-message-stream/dist/window/WindowPostMessageStream.js
-@@ -6,11 +6,21 @@ const utils_1 = require("@metamask/utils");
+@@ -17,11 +17,21 @@ const utils_1 = require("@metamask/utils");
  const BasePostMessageStream_1 = require("../BasePostMessageStream");
  const utils_2 = require("../utils");
  /* istanbul ignore next */
diff --git a/yarn.lock b/yarn.lock
index edc0f9c3ca07..f467669969c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4529,6 +4529,17 @@
     "@metamask/utils" "^9.2.1"
     ethereum-cryptography "^2.1.2"
 
+"@metamask/eth-json-rpc-filters@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-filters/-/eth-json-rpc-filters-8.0.0.tgz#fd0ca224dc198e270e142c1f2007e05cacb5f16a"
+  integrity sha512-kDwSoas8gYWtN79AO4vvyKvaL8bIMstpuwZdsWTSc1goBFTOJEscCD6zUX+MOQFnQohFoC512mNeA5tPLRV46A==
+  dependencies:
+    "@metamask/eth-query" "^4.0.0"
+    "@metamask/json-rpc-engine" "^9.0.0"
+    "@metamask/safe-event-emitter" "^3.0.0"
+    async-mutex "^0.5.0"
+    pify "^5.0.0"
+
 "@metamask/eth-json-rpc-infura@^9.0.0", "@metamask/eth-json-rpc-infura@^9.1.0":
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-infura/-/eth-json-rpc-infura-9.1.0.tgz#8e09588ed58f49058615cab7040dcbce4682a292"
@@ -16998,17 +17009,6 @@ eth-ens-namehash@^1.0.2:
     idna-uts46 "^1.0.1"
     js-sha3 "^0.5.7"
 
-eth-json-rpc-filters@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-6.0.1.tgz#0b3e370f017f5c6f58d3e7bd0756d8099ed85c56"
-  integrity sha512-ITJTvqoCw6OVMLs7pI8f4gG92n/St6x80ACtHodeS+IXmO0w+t1T5OOzfSt7KLSMLRkVUoexV7tztLgDxg+iig==
-  dependencies:
-    "@metamask/safe-event-emitter" "^3.0.0"
-    async-mutex "^0.2.6"
-    eth-query "^2.1.2"
-    json-rpc-engine "^6.1.0"
-    pify "^5.0.0"
-
 eth-json-rpc-middleware@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-9.0.1.tgz#193cb05174739fb736737bbbf992e13010c4b44e"
@@ -17041,14 +17041,6 @@ eth-phishing-detect@^1.2.0:
   dependencies:
     fast-levenshtein "^2.0.6"
 
-eth-query@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.2.tgz#d6741d9000106b51510c72db92d6365456a6da5e"
-  integrity sha1-1nQdkAAQa1FRDHLbktY2VFam2l4=
-  dependencies:
-    json-rpc-random-id "^1.0.0"
-    xtend "^4.0.1"
-
 eth-rpc-errors@^4.0.2, eth-rpc-errors@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a"