diff --git a/log-filter.js b/log-filter.js
index ef55746..29def3d 100644
--- a/log-filter.js
+++ b/log-filter.js
@@ -1,4 +1,4 @@
-const EthQuery = require('eth-query')
+const EthQuery = require('@metamask/eth-query')
 const pify = require('pify')
 const BaseFilterWithHistory = require('./base-filter-history')
 const { bnToHex, hexToInt, incrementHexInt, minBlockRef, blockRefIsNumber } = require('./hexUtils')
diff --git a/package.json b/package.json
index 1ca3ada..0657a7e 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,10 @@
     "*.js"
   ],
   "dependencies": {
+    "@metamask/eth-query": "^3.0.1",
+    "@metamask/json-rpc-engine": "^7.1.0",
     "@metamask/safe-event-emitter": "^3.0.0",
     "async-mutex": "^0.2.6",
-    "eth-query": "^2.1.2",
-    "@metamask/json-rpc-engine": "^7.1.0",
     "pify": "^5.0.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 9320001..45c3e95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -76,15 +76,6 @@
     ethereum-cryptography "^2.0.0"
     micro-ftch "^0.3.1"
 
-"@ethereumjs/util@^8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.1.0.tgz#299df97fb6b034e0577ce9f94c7d9d1004409ed4"
-  integrity sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==
-  dependencies:
-    "@ethereumjs/rlp" "^4.0.1"
-    ethereum-cryptography "^2.0.0"
-    micro-ftch "^0.3.1"
-
 "@ethersproject/abi@5.0.0-beta.153":
   version "5.0.0-beta.153"
   resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz#43a37172b33794e4562999f6e2d555b7599a8eee"
@@ -323,6 +314,14 @@
     "@metamask/safe-event-emitter" "^3.0.0"
     "@metamask/utils" "^5.0.1"
 
+"@metamask/eth-query@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@metamask/eth-query/-/eth-query-3.0.1.tgz#3439eb6c7d5ccff1d6a66df1d1802bae0c890444"
+  integrity sha512-yJ3sVImrR2r95It/Xd9NPnb5lX6ZUmtSxMY2R8nG/yS5QrSiPkJ/898R4+sJg/8EZplmOyZp5fGvjSNNDE/OGQ==
+  dependencies:
+    json-rpc-random-id "^1.0.0"
+    xtend "^4.0.1"
+
 "@metamask/eth-sig-util@^5.0.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-5.1.0.tgz#a47f62800ee1917fef976ba67544a0ccd7d1bd6b"