diff --git a/packages/interface-ipfs-core/src/refs.js b/packages/interface-ipfs-core/src/refs.js
index 8db1f7ed83..f66a041017 100644
--- a/packages/interface-ipfs-core/src/refs.js
+++ b/packages/interface-ipfs-core/src/refs.js
@@ -323,8 +323,7 @@ function getRefsTests () {
     'should print nothing for non-existent hashes': {
       path: () => 'QmYmW4HiZhotsoSqnv2o1oSssvkRM8b9RweBoH7ao5nki2',
       params: { timeout: 2000 },
-      expected: [],
-      expectTimeout: true
+      expected: ['']
     }
   }
 }
diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json
index 55b352e60e..36058c2c5b 100644
--- a/packages/ipfs-core/package.json
+++ b/packages/ipfs-core/package.json
@@ -62,6 +62,7 @@
     "@ipld/dag-pb": "^2.1.3",
     "@multiformats/murmur3": "^1.0.1",
     "abort-controller": "^3.0.0",
+    "any-signal": "^2.1.2",
     "array-shuffle": "^2.0.0",
     "blockstore-datastore-adapter": "^1.0.0",
     "datastore-core": "^5.0.1",
@@ -126,6 +127,7 @@
     "parse-duration": "^1.0.0",
     "peer-id": "^0.15.1",
     "streaming-iterables": "^6.0.0",
+    "timeout-abort-controller": "^1.1.1",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
diff --git a/packages/ipfs-core/src/components/refs/index.js b/packages/ipfs-core/src/components/refs/index.js
index 3a4e146a27..45893b58f6 100644
--- a/packages/ipfs-core/src/components/refs/index.js
+++ b/packages/ipfs-core/src/components/refs/index.js
@@ -3,9 +3,11 @@
 const dagPb = require('@ipld/dag-pb')
 const { Errors } = require('interface-datastore')
 const ERR_NOT_FOUND = Errors.notFoundError().code
-const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')
 const toCIDAndPath = require('ipfs-core-utils/src/to-cid-and-path')
 const { CID } = require('multiformats/cid')
+// @ts-expect-error no types
+const TimeoutController = require('timeout-abort-controller')
+const { anySignal } = require('any-signal')
 
 const Format = {
   default: '<dst>',
@@ -21,6 +23,8 @@ const Format = {
  * @property {Node} parent
  * @property {Node} node
  * @property {boolean} isDuplicate
+ *
+ * @typedef {import('ipfs-core-types/src/utils').AbortOptions} AbortOptions
  */
 
 /**
@@ -49,17 +53,30 @@ module.exports = function ({ repo, codecs, resolve, preload }) {
       options.maxDepth = options.recursive ? Infinity : 1
     }
 
+    if (options.timeout) {
+      const controller = new TimeoutController(options.timeout)
+
+      options.signal = anySignal([options.signal, controller.signal])
+    }
+
     /** @type {(string|CID)[]} */
     const rawPaths = Array.isArray(ipfsPath) ? ipfsPath : [ipfsPath]
 
     const paths = rawPaths.map(p => getFullPath(preload, p, options))
 
     for (const path of paths) {
-      yield * refsStream(resolve, repo, codecs, path, options)
+      try {
+        yield * refsStream(resolve, repo, codecs, path, options)
+      } catch (err) {
+        yield {
+          ref: '',
+          err: err.message
+        }
+      }
     }
   }
 
-  return withTimeoutOption(refs)
+  return refs
 }
 
 module.exports.Format = Format
@@ -93,7 +110,7 @@ function getFullPath (preload, ipfsPath, options) {
  */
 async function * refsStream (resolve, repo, codecs, path, options) {
   // Resolve to the target CID of the path
-  const resPath = await resolve(path)
+  const resPath = await resolve(path, options)
   const {
     cid
   } = toCIDAndPath(resPath)
@@ -102,7 +119,7 @@ async function * refsStream (resolve, repo, codecs, path, options) {
   const unique = options.unique || false
 
   // Traverse the DAG, converting it into a stream
-  for await (const obj of objectStream(repo, codecs, cid, maxDepth, unique)) {
+  for await (const obj of objectStream(repo, codecs, cid, maxDepth, unique, options)) {
     // Root object will not have a parent
     if (!obj.parent) {
       continue
@@ -144,8 +161,9 @@ function formatLink (srcCid, dstCid, linkName = '', format = Format.default) {
  * @param {CID} rootCid
  * @param {number} maxDepth
  * @param {boolean} uniqueOnly
+ * @param {AbortOptions} options
  */
-async function * objectStream (repo, codecs, rootCid, maxDepth, uniqueOnly) { // eslint-disable-line require-await
+async function * objectStream (repo, codecs, rootCid, maxDepth, uniqueOnly, options) { // eslint-disable-line require-await
   const seen = new Set()
 
   /**
@@ -164,7 +182,7 @@ async function * objectStream (repo, codecs, rootCid, maxDepth, uniqueOnly) { //
     // Get this object's links
     try {
       // Look at each link, parent and the new depth
-      for await (const link of getLinks(repo, codecs, parent.cid)) {
+      for await (const link of getLinks(repo, codecs, parent.cid, options)) {
         yield {
           parent: parent,
           node: link,
@@ -195,14 +213,16 @@ async function * objectStream (repo, codecs, rootCid, maxDepth, uniqueOnly) { //
  * @param {import('ipfs-repo').IPFSRepo} repo
  * @param {import('ipfs-core-utils/src/multicodecs')} codecs
  * @param {CID} cid
- * @param {Array<string|number>} base
+ * @param {AbortOptions} options
  * @returns {AsyncGenerator<{ name: string, cid: CID }, void, undefined>}
  */
-async function * getLinks (repo, codecs, cid, base = []) {
-  const block = await repo.blocks.get(cid)
+async function * getLinks (repo, codecs, cid, options) {
+  const block = await repo.blocks.get(cid, options)
   const codec = await codecs.getCodec(cid.code)
   const value = codec.decode(block)
   const isDagPb = cid.code === dagPb.code
+  /** @type {Array<string|number>} */
+  const base = []
 
   for (const [name, cid] of links(value, base)) {
     // special case for dag-pb - use the name of the link
diff --git a/packages/ipfs-http-client/src/add-all.js b/packages/ipfs-http-client/src/add-all.js
index 8c85b873d8..8ece7cf157 100644
--- a/packages/ipfs-http-client/src/add-all.js
+++ b/packages/ipfs-http-client/src/add-all.js
@@ -43,7 +43,6 @@ module.exports = configure((api) => {
         ...options,
         progress: Boolean(progressFn)
       }),
-      timeout: options.timeout,
       onUploadProgress,
       signal,
       headers,
diff --git a/packages/ipfs-http-client/src/bitswap/stat.js b/packages/ipfs-http-client/src/bitswap/stat.js
index 35d2978768..17965ba85d 100644
--- a/packages/ipfs-http-client/src/bitswap/stat.js
+++ b/packages/ipfs-http-client/src/bitswap/stat.js
@@ -16,7 +16,6 @@ module.exports = configure(api => {
   async function stat (options = {}) {
     const res = await api.post('bitswap/stat', {
       searchParams: toUrlSearchParams(options),
-      timeout: options.timeout,
       signal: options.signal,
       headers: options.headers
     })
diff --git a/packages/ipfs-http-client/src/bitswap/unwant.js b/packages/ipfs-http-client/src/bitswap/unwant.js
index 847b38397a..943565dff4 100644
--- a/packages/ipfs-http-client/src/bitswap/unwant.js
+++ b/packages/ipfs-http-client/src/bitswap/unwant.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function unwant (cid, options = {}) {
     const res = await api.post('bitswap/unwant', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: cid.toString(),
diff --git a/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js b/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
index 8dac0bf4d8..23c8d52ea7 100644
--- a/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
+++ b/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function wantlistForPeer (peerId, options = {}) {
     const res = await (await api.post('bitswap/wantlist', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         ...options,
diff --git a/packages/ipfs-http-client/src/bitswap/wantlist.js b/packages/ipfs-http-client/src/bitswap/wantlist.js
index 60d37d183b..6898dfc228 100644
--- a/packages/ipfs-http-client/src/bitswap/wantlist.js
+++ b/packages/ipfs-http-client/src/bitswap/wantlist.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function wantlist (options = {}) {
     const res = await (await api.post('bitswap/wantlist', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/block/get.js b/packages/ipfs-http-client/src/block/get.js
index 75d4f5fe75..cf21b966c9 100644
--- a/packages/ipfs-http-client/src/block/get.js
+++ b/packages/ipfs-http-client/src/block/get.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function get (cid, options = {}) {
     const res = await api.post('block/get', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: cid.toString(),
diff --git a/packages/ipfs-http-client/src/block/put.js b/packages/ipfs-http-client/src/block/put.js
index 57ba474dbe..8d2f03428b 100644
--- a/packages/ipfs-http-client/src/block/put.js
+++ b/packages/ipfs-http-client/src/block/put.js
@@ -24,7 +24,6 @@ module.exports = configure(api => {
     let res
     try {
       const response = await api.post('block/put', {
-        timeout: options.timeout,
         signal: signal,
         searchParams: toUrlSearchParams(options),
         ...(
diff --git a/packages/ipfs-http-client/src/block/rm.js b/packages/ipfs-http-client/src/block/rm.js
index 18d9e17c1e..7ebe6ff0f5 100644
--- a/packages/ipfs-http-client/src/block/rm.js
+++ b/packages/ipfs-http-client/src/block/rm.js
@@ -20,7 +20,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('block/rm', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: cid.map(cid => cid.toString()),
diff --git a/packages/ipfs-http-client/src/block/stat.js b/packages/ipfs-http-client/src/block/stat.js
index 8e6d143642..1e18c567fb 100644
--- a/packages/ipfs-http-client/src/block/stat.js
+++ b/packages/ipfs-http-client/src/block/stat.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function stat (cid, options = {}) {
     const res = await api.post('block/stat', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: cid.toString(),
diff --git a/packages/ipfs-http-client/src/bootstrap/add.js b/packages/ipfs-http-client/src/bootstrap/add.js
index 6caa170a85..42373ee971 100644
--- a/packages/ipfs-http-client/src/bootstrap/add.js
+++ b/packages/ipfs-http-client/src/bootstrap/add.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function add (addr, options = {}) {
     const res = await api.post('bootstrap/add', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: addr,
diff --git a/packages/ipfs-http-client/src/bootstrap/clear.js b/packages/ipfs-http-client/src/bootstrap/clear.js
index 26355bbb55..90b90610a1 100644
--- a/packages/ipfs-http-client/src/bootstrap/clear.js
+++ b/packages/ipfs-http-client/src/bootstrap/clear.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function clear (options = {}) {
     const res = await api.post('bootstrap/rm', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         ...options,
diff --git a/packages/ipfs-http-client/src/bootstrap/list.js b/packages/ipfs-http-client/src/bootstrap/list.js
index aad38554b1..32843f6272 100644
--- a/packages/ipfs-http-client/src/bootstrap/list.js
+++ b/packages/ipfs-http-client/src/bootstrap/list.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function list (options = {}) {
     const res = await api.post('bootstrap/list', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/bootstrap/reset.js b/packages/ipfs-http-client/src/bootstrap/reset.js
index b958d78700..e02d1e8bc2 100644
--- a/packages/ipfs-http-client/src/bootstrap/reset.js
+++ b/packages/ipfs-http-client/src/bootstrap/reset.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function reset (options = {}) {
     const res = await api.post('bootstrap/add', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         ...options,
diff --git a/packages/ipfs-http-client/src/bootstrap/rm.js b/packages/ipfs-http-client/src/bootstrap/rm.js
index 13cea8dbe0..529ecc9284 100644
--- a/packages/ipfs-http-client/src/bootstrap/rm.js
+++ b/packages/ipfs-http-client/src/bootstrap/rm.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function rm (addr, options = {}) {
     const res = await api.post('bootstrap/rm', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: addr,
diff --git a/packages/ipfs-http-client/src/cat.js b/packages/ipfs-http-client/src/cat.js
index 6d0e21fa60..774850bb93 100644
--- a/packages/ipfs-http-client/src/cat.js
+++ b/packages/ipfs-http-client/src/cat.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function * cat (path, options = {}) {
     const res = await api.post('cat', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path.toString(),
diff --git a/packages/ipfs-http-client/src/commands.js b/packages/ipfs-http-client/src/commands.js
index 69f134cb0d..a6677a3d5a 100644
--- a/packages/ipfs-http-client/src/commands.js
+++ b/packages/ipfs-http-client/src/commands.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   const commands = async (options = {}) => {
     const res = await api.post('commands', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/config/get.js b/packages/ipfs-http-client/src/config/get.js
index 1d480b54d2..e09f51f9c4 100644
--- a/packages/ipfs-http-client/src/config/get.js
+++ b/packages/ipfs-http-client/src/config/get.js
@@ -18,7 +18,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('config', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: key,
diff --git a/packages/ipfs-http-client/src/config/getAll.js b/packages/ipfs-http-client/src/config/getAll.js
index 35d83e5236..21d164a9c9 100644
--- a/packages/ipfs-http-client/src/config/getAll.js
+++ b/packages/ipfs-http-client/src/config/getAll.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   const getAll = async (options = {}) => {
     const res = await api.post('config/show', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         ...options
diff --git a/packages/ipfs-http-client/src/config/profiles/apply.js b/packages/ipfs-http-client/src/config/profiles/apply.js
index 12d0a21211..fa2b90b8e1 100644
--- a/packages/ipfs-http-client/src/config/profiles/apply.js
+++ b/packages/ipfs-http-client/src/config/profiles/apply.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function apply (profile, options = {}) {
     const res = await api.post('config/profile/apply', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: profile,
diff --git a/packages/ipfs-http-client/src/config/profiles/list.js b/packages/ipfs-http-client/src/config/profiles/list.js
index 4cb96d0247..b699088f34 100644
--- a/packages/ipfs-http-client/src/config/profiles/list.js
+++ b/packages/ipfs-http-client/src/config/profiles/list.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function list (options = {}) {
     const res = await api.post('config/profile/list', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/config/replace.js b/packages/ipfs-http-client/src/config/replace.js
index 47a2df40f0..7b54a58f57 100644
--- a/packages/ipfs-http-client/src/config/replace.js
+++ b/packages/ipfs-http-client/src/config/replace.js
@@ -22,7 +22,6 @@ module.exports = configure(api => {
     const signal = abortSignal(controller.signal, options.signal)
 
     const res = await api.post('config/replace', {
-      timeout: options.timeout,
       signal,
       searchParams: toUrlSearchParams(options),
       ...(
diff --git a/packages/ipfs-http-client/src/config/set.js b/packages/ipfs-http-client/src/config/set.js
index 3cfbe770c0..0597b3a22b 100644
--- a/packages/ipfs-http-client/src/config/set.js
+++ b/packages/ipfs-http-client/src/config/set.js
@@ -23,7 +23,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('config', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(params),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/dag/export.js b/packages/ipfs-http-client/src/dag/export.js
index ea048a2aae..b513a15cd9 100644
--- a/packages/ipfs-http-client/src/dag/export.js
+++ b/packages/ipfs-http-client/src/dag/export.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function * dagExport (root, options = {}) {
     const res = await api.post('dag/export', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: root.toString()
diff --git a/packages/ipfs-http-client/src/dag/import.js b/packages/ipfs-http-client/src/dag/import.js
index 4f56a44a2d..3a0c2276f3 100644
--- a/packages/ipfs-http-client/src/dag/import.js
+++ b/packages/ipfs-http-client/src/dag/import.js
@@ -22,7 +22,6 @@ module.exports = configure(api => {
     const { headers, body } = await multipartRequest(source, controller, options.headers)
 
     const res = await api.post('dag/import', {
-      timeout: options.timeout,
       signal,
       headers,
       body,
diff --git a/packages/ipfs-http-client/src/dag/resolve.js b/packages/ipfs-http-client/src/dag/resolve.js
index ad2d7a58f6..35bcb3712b 100644
--- a/packages/ipfs-http-client/src/dag/resolve.js
+++ b/packages/ipfs-http-client/src/dag/resolve.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   const resolve = async (ipfsPath, options = {}) => {
     const res = await api.post('dag/resolve', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: `${ipfsPath}${options.path ? `/${options.path}`.replace(/\/[/]+/g, '/') : ''}`,
diff --git a/packages/ipfs-http-client/src/dht/find-peer.js b/packages/ipfs-http-client/src/dht/find-peer.js
index 4e9880fb9e..ea12ea70b6 100644
--- a/packages/ipfs-http-client/src/dht/find-peer.js
+++ b/packages/ipfs-http-client/src/dht/find-peer.js
@@ -16,7 +16,6 @@ module.exports = configure(api => {
    */
   async function findPeer (peerId, options = {}) {
     const res = await api.post('dht/findpeer', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: peerId,
diff --git a/packages/ipfs-http-client/src/dht/find-provs.js b/packages/ipfs-http-client/src/dht/find-provs.js
index 91b4cd63a6..b712d8dfb8 100644
--- a/packages/ipfs-http-client/src/dht/find-provs.js
+++ b/packages/ipfs-http-client/src/dht/find-provs.js
@@ -16,7 +16,6 @@ module.exports = configure(api => {
    */
   async function * findProvs (cid, options = {}) {
     const res = await api.post('dht/findprovs', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: cid.toString(),
diff --git a/packages/ipfs-http-client/src/dht/get.js b/packages/ipfs-http-client/src/dht/get.js
index 44bb6b9129..6ff8dfbb22 100644
--- a/packages/ipfs-http-client/src/dht/get.js
+++ b/packages/ipfs-http-client/src/dht/get.js
@@ -17,7 +17,6 @@ module.exports = configure(api => {
    */
   async function get (key, options = {}) {
     const res = await api.post('dht/get', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: key instanceof Uint8Array ? uint8ArrayToString(key) : key,
diff --git a/packages/ipfs-http-client/src/dht/provide.js b/packages/ipfs-http-client/src/dht/provide.js
index 01aedbce1a..632abac7b8 100644
--- a/packages/ipfs-http-client/src/dht/provide.js
+++ b/packages/ipfs-http-client/src/dht/provide.js
@@ -20,7 +20,6 @@ module.exports = configure(api => {
     const cidArr = Array.isArray(cids) ? cids : [cids]
 
     const res = await api.post('dht/provide', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: cidArr.map(cid => cid.toString()),
diff --git a/packages/ipfs-http-client/src/dht/put.js b/packages/ipfs-http-client/src/dht/put.js
index d53c853aaa..4e82f94fac 100644
--- a/packages/ipfs-http-client/src/dht/put.js
+++ b/packages/ipfs-http-client/src/dht/put.js
@@ -24,7 +24,6 @@ module.exports = configure(api => {
     const signal = abortSignal(controller.signal, options.signal)
 
     const res = await api.post('dht/put', {
-      timeout: options.timeout,
       signal,
       searchParams: toUrlSearchParams({
         arg: uint8ArrayToString(key),
diff --git a/packages/ipfs-http-client/src/dht/query.js b/packages/ipfs-http-client/src/dht/query.js
index 14f3326c7b..6158340235 100644
--- a/packages/ipfs-http-client/src/dht/query.js
+++ b/packages/ipfs-http-client/src/dht/query.js
@@ -16,7 +16,6 @@ module.exports = configure(api => {
    */
   async function * query (peerId, options = {}) {
     const res = await api.post('dht/query', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: peerId.toString(),
diff --git a/packages/ipfs-http-client/src/diag/cmds.js b/packages/ipfs-http-client/src/diag/cmds.js
index 1bd2c06e37..72a581bcc2 100644
--- a/packages/ipfs-http-client/src/diag/cmds.js
+++ b/packages/ipfs-http-client/src/diag/cmds.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function cmds (options = {}) {
     const res = await api.post('diag/cmds', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/diag/net.js b/packages/ipfs-http-client/src/diag/net.js
index d485af7c4a..6e3ad62b62 100644
--- a/packages/ipfs-http-client/src/diag/net.js
+++ b/packages/ipfs-http-client/src/diag/net.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function net (options = {}) {
     const res = await api.post('diag/net', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/diag/sys.js b/packages/ipfs-http-client/src/diag/sys.js
index 31f1a5bd03..6eda773172 100644
--- a/packages/ipfs-http-client/src/diag/sys.js
+++ b/packages/ipfs-http-client/src/diag/sys.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function sys (options = {}) {
     const res = await api.post('diag/sys', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/dns.js b/packages/ipfs-http-client/src/dns.js
index 6059d30de3..38c716b1e7 100644
--- a/packages/ipfs-http-client/src/dns.js
+++ b/packages/ipfs-http-client/src/dns.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   const dns = async (domain, options = {}) => {
     const res = await api.post('dns', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: domain,
diff --git a/packages/ipfs-http-client/src/files/chmod.js b/packages/ipfs-http-client/src/files/chmod.js
index 6cd344d480..85698c153f 100644
--- a/packages/ipfs-http-client/src/files/chmod.js
+++ b/packages/ipfs-http-client/src/files/chmod.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function chmod (path, mode, options = {}) {
     const res = await api.post('files/chmod', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/files/cp.js b/packages/ipfs-http-client/src/files/cp.js
index 4dbe59ef0f..1f8c16c332 100644
--- a/packages/ipfs-http-client/src/files/cp.js
+++ b/packages/ipfs-http-client/src/files/cp.js
@@ -18,7 +18,6 @@ module.exports = configure(api => {
     const sourceArr = Array.isArray(sources) ? sources : [sources]
 
     const res = await api.post('files/cp', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: sourceArr.concat(destination).map(src => src instanceof CID ? `/ipfs/${src}` : src),
diff --git a/packages/ipfs-http-client/src/files/flush.js b/packages/ipfs-http-client/src/files/flush.js
index 0c04cc809f..ce3de06825 100644
--- a/packages/ipfs-http-client/src/files/flush.js
+++ b/packages/ipfs-http-client/src/files/flush.js
@@ -19,7 +19,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('files/flush', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/files/ls.js b/packages/ipfs-http-client/src/files/ls.js
index 67d4b24323..c3986f557f 100644
--- a/packages/ipfs-http-client/src/files/ls.js
+++ b/packages/ipfs-http-client/src/files/ls.js
@@ -19,7 +19,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('files/ls', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path instanceof CID ? `/ipfs/${path}` : path,
diff --git a/packages/ipfs-http-client/src/files/mkdir.js b/packages/ipfs-http-client/src/files/mkdir.js
index 86952f9dac..05102ef602 100644
--- a/packages/ipfs-http-client/src/files/mkdir.js
+++ b/packages/ipfs-http-client/src/files/mkdir.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function mkdir (path, options = {}) {
     const res = await api.post('files/mkdir', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/files/mv.js b/packages/ipfs-http-client/src/files/mv.js
index 92ab4fe0f9..1ec7b9d230 100644
--- a/packages/ipfs-http-client/src/files/mv.js
+++ b/packages/ipfs-http-client/src/files/mv.js
@@ -18,7 +18,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('files/mv', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: sources.concat(destination),
diff --git a/packages/ipfs-http-client/src/files/read.js b/packages/ipfs-http-client/src/files/read.js
index 26b6b80495..6b3ae76107 100644
--- a/packages/ipfs-http-client/src/files/read.js
+++ b/packages/ipfs-http-client/src/files/read.js
@@ -16,7 +16,6 @@ module.exports = configure(api => {
    */
   async function * read (path, options = {}) {
     const res = await api.post('files/read', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/files/rm.js b/packages/ipfs-http-client/src/files/rm.js
index bc9a5a47ae..d4bec8db7c 100644
--- a/packages/ipfs-http-client/src/files/rm.js
+++ b/packages/ipfs-http-client/src/files/rm.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function rm (path, options = {}) {
     const res = await api.post('files/rm', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/files/stat.js b/packages/ipfs-http-client/src/files/stat.js
index f5f678590f..2a54bdd663 100644
--- a/packages/ipfs-http-client/src/files/stat.js
+++ b/packages/ipfs-http-client/src/files/stat.js
@@ -23,7 +23,6 @@ module.exports = configure(api => {
     options = options || {}
 
     const res = await api.post('files/stat', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/files/touch.js b/packages/ipfs-http-client/src/files/touch.js
index ad0fb6982c..a7079b338b 100644
--- a/packages/ipfs-http-client/src/files/touch.js
+++ b/packages/ipfs-http-client/src/files/touch.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function touch (path, options = {}) {
     const res = await api.post('files/touch', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/files/write.js b/packages/ipfs-http-client/src/files/write.js
index aa3b19d7ad..13939425d2 100644
--- a/packages/ipfs-http-client/src/files/write.js
+++ b/packages/ipfs-http-client/src/files/write.js
@@ -23,7 +23,6 @@ module.exports = configure(api => {
     const signal = abortSignal(controller.signal, options.signal)
 
     const res = await api.post('files/write', {
-      timeout: options.timeout,
       signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/get.js b/packages/ipfs-http-client/src/get.js
index 80228c9670..1171ca526f 100644
--- a/packages/ipfs-http-client/src/get.js
+++ b/packages/ipfs-http-client/src/get.js
@@ -26,7 +26,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('get', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(opts),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/id.js b/packages/ipfs-http-client/src/id.js
index ef8aa146d4..d7c3aaa082 100644
--- a/packages/ipfs-http-client/src/id.js
+++ b/packages/ipfs-http-client/src/id.js
@@ -16,7 +16,6 @@ module.exports = configure(api => {
    */
   async function id (options = {}) {
     const res = await api.post('id', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: options.peerId ? options.peerId.toString() : undefined,
diff --git a/packages/ipfs-http-client/src/key/gen.js b/packages/ipfs-http-client/src/key/gen.js
index f838e2b7b8..7a9e4dfd48 100644
--- a/packages/ipfs-http-client/src/key/gen.js
+++ b/packages/ipfs-http-client/src/key/gen.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function gen (name, options = { type: 'rsa', size: 2048 }) {
     const res = await api.post('key/gen', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: name,
diff --git a/packages/ipfs-http-client/src/key/import.js b/packages/ipfs-http-client/src/key/import.js
index 006a296ab4..450923f307 100644
--- a/packages/ipfs-http-client/src/key/import.js
+++ b/packages/ipfs-http-client/src/key/import.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function importKey (name, pem, password, options = {}) {
     const res = await api.post('key/import', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: name,
diff --git a/packages/ipfs-http-client/src/key/list.js b/packages/ipfs-http-client/src/key/list.js
index 7dbc55147a..6d05f62d4e 100644
--- a/packages/ipfs-http-client/src/key/list.js
+++ b/packages/ipfs-http-client/src/key/list.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function list (options = {}) {
     const res = await api.post('key/list', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/key/rename.js b/packages/ipfs-http-client/src/key/rename.js
index b891574c97..fbc00d3fd5 100644
--- a/packages/ipfs-http-client/src/key/rename.js
+++ b/packages/ipfs-http-client/src/key/rename.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function rename (oldName, newName, options = {}) {
     const res = await api.post('key/rename', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: [
diff --git a/packages/ipfs-http-client/src/key/rm.js b/packages/ipfs-http-client/src/key/rm.js
index f1c87f8b07..1f202dd823 100644
--- a/packages/ipfs-http-client/src/key/rm.js
+++ b/packages/ipfs-http-client/src/key/rm.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function rm (name, options = {}) {
     const res = await api.post('key/rm', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: name,
diff --git a/packages/ipfs-http-client/src/lib/core.js b/packages/ipfs-http-client/src/lib/core.js
index fc964f883f..4e6c4be9bb 100644
--- a/packages/ipfs-http-client/src/lib/core.js
+++ b/packages/ipfs-http-client/src/lib/core.js
@@ -99,14 +99,21 @@ const errorHandler = async (response) => {
   /** @type {Error} */
   let error = new HTTP.HTTPError(response)
 
-  // This is what go-ipfs returns where there's a timeout
-  if (msg && msg.includes('context deadline exceeded')) {
-    error = new HTTP.TimeoutError('Request timed out')
+  if (msg) {
+    // This is what rs-ipfs returns where there's a timeout
+    if (msg.includes('deadline has elapsed')) {
+      error = new HTTP.TimeoutError()
+    }
+
+    // This is what go-ipfs returns where there's a timeout
+    if (msg && msg.includes('context deadline exceeded')) {
+      error = new HTTP.TimeoutError()
+    }
   }
 
   // This also gets returned
   if (msg && msg.includes('request timed out')) {
-    error = new HTTP.TimeoutError('Request timed out')
+    error = new HTTP.TimeoutError()
   }
 
   // If we managed to extract a message from the response, use it
@@ -143,7 +150,7 @@ class Client extends HTTP {
     const opts = normalizeOptions(options)
 
     super({
-      timeout: parseTimeout(opts.timeout || 0) || 60000 * 20,
+      timeout: parseTimeout(opts.timeout || 0) || undefined,
       headers: opts.headers,
       base: `${opts.url}`,
       handleError: errorHandler,
diff --git a/packages/ipfs-http-client/src/log/level.js b/packages/ipfs-http-client/src/log/level.js
index 4227bb684b..2be6522491 100644
--- a/packages/ipfs-http-client/src/log/level.js
+++ b/packages/ipfs-http-client/src/log/level.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function level (subsystem, level, options = {}) {
     const res = await api.post('log/level', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: [
diff --git a/packages/ipfs-http-client/src/log/ls.js b/packages/ipfs-http-client/src/log/ls.js
index 362018386c..53eeb5ef8f 100644
--- a/packages/ipfs-http-client/src/log/ls.js
+++ b/packages/ipfs-http-client/src/log/ls.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function ls (options = {}) {
     const res = await api.post('log/ls', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/log/tail.js b/packages/ipfs-http-client/src/log/tail.js
index 443c3717c4..bb8a768de3 100644
--- a/packages/ipfs-http-client/src/log/tail.js
+++ b/packages/ipfs-http-client/src/log/tail.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function * tail (options = {}) {
     const res = await api.post('log/tail', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/ls.js b/packages/ipfs-http-client/src/ls.js
index 73a935548e..46d7cc14d7 100644
--- a/packages/ipfs-http-client/src/ls.js
+++ b/packages/ipfs-http-client/src/ls.js
@@ -60,7 +60,6 @@ module.exports = configure((api, opts) => {
     }
 
     const res = await api.post('ls', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: pathStr,
diff --git a/packages/ipfs-http-client/src/mount.js b/packages/ipfs-http-client/src/mount.js
index edb7734c5c..0257f51ea5 100644
--- a/packages/ipfs-http-client/src/mount.js
+++ b/packages/ipfs-http-client/src/mount.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function mount (options = {}) {
     const res = await api.post('dns', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/name/publish.js b/packages/ipfs-http-client/src/name/publish.js
index 8eccd7168d..d5e5f1adc1 100644
--- a/packages/ipfs-http-client/src/name/publish.js
+++ b/packages/ipfs-http-client/src/name/publish.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function publish (path, options = {}) {
     const res = await api.post('name/publish', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: `${path}`,
diff --git a/packages/ipfs-http-client/src/name/pubsub/cancel.js b/packages/ipfs-http-client/src/name/pubsub/cancel.js
index 3c6aa9fdd0..4fe87e2f88 100644
--- a/packages/ipfs-http-client/src/name/pubsub/cancel.js
+++ b/packages/ipfs-http-client/src/name/pubsub/cancel.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function cancel (name, options = {}) {
     const res = await api.post('name/pubsub/cancel', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: name,
diff --git a/packages/ipfs-http-client/src/name/pubsub/state.js b/packages/ipfs-http-client/src/name/pubsub/state.js
index 97849b25a1..ee4956bfad 100644
--- a/packages/ipfs-http-client/src/name/pubsub/state.js
+++ b/packages/ipfs-http-client/src/name/pubsub/state.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function state (options = {}) {
     const res = await api.post('name/pubsub/state', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/name/pubsub/subs.js b/packages/ipfs-http-client/src/name/pubsub/subs.js
index 2827c6e42f..e0bb23a782 100644
--- a/packages/ipfs-http-client/src/name/pubsub/subs.js
+++ b/packages/ipfs-http-client/src/name/pubsub/subs.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function subs (options = {}) {
     const res = await api.post('name/pubsub/subs', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/name/resolve.js b/packages/ipfs-http-client/src/name/resolve.js
index 087f6f5519..cf9098332d 100644
--- a/packages/ipfs-http-client/src/name/resolve.js
+++ b/packages/ipfs-http-client/src/name/resolve.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function * resolve (path, options = {}) {
     const res = await api.post('name/resolve', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/object/data.js b/packages/ipfs-http-client/src/object/data.js
index e651aa31bf..bba9de9f51 100644
--- a/packages/ipfs-http-client/src/object/data.js
+++ b/packages/ipfs-http-client/src/object/data.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function data (cid, options = {}) {
     const res = await api.post('object/data', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: `${cid instanceof Uint8Array ? CID.decode(cid) : cid}`,
diff --git a/packages/ipfs-http-client/src/object/get.js b/packages/ipfs-http-client/src/object/get.js
index 4d35149b8b..7cdabc1019 100644
--- a/packages/ipfs-http-client/src/object/get.js
+++ b/packages/ipfs-http-client/src/object/get.js
@@ -16,7 +16,6 @@ module.exports = configure(api => {
    */
   async function get (cid, options = {}) {
     const res = await api.post('object/get', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: `${cid instanceof Uint8Array ? CID.decode(cid) : cid}`,
diff --git a/packages/ipfs-http-client/src/object/links.js b/packages/ipfs-http-client/src/object/links.js
index 02e230b9aa..3e51acb626 100644
--- a/packages/ipfs-http-client/src/object/links.js
+++ b/packages/ipfs-http-client/src/object/links.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function links (cid, options = {}) {
     const res = await api.post('object/links', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: `${cid instanceof Uint8Array ? CID.decode(cid) : cid}`,
diff --git a/packages/ipfs-http-client/src/object/new.js b/packages/ipfs-http-client/src/object/new.js
index 718688d748..ca296da763 100644
--- a/packages/ipfs-http-client/src/object/new.js
+++ b/packages/ipfs-http-client/src/object/new.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function newObject (options = {}) {
     const res = await api.post('object/new', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: options.template,
diff --git a/packages/ipfs-http-client/src/object/patch/add-link.js b/packages/ipfs-http-client/src/object/patch/add-link.js
index b9d20626d8..ba8d1a8c99 100644
--- a/packages/ipfs-http-client/src/object/patch/add-link.js
+++ b/packages/ipfs-http-client/src/object/patch/add-link.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function addLink (cid, dLink, options = {}) {
     const res = await api.post('object/patch/add-link', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: [
diff --git a/packages/ipfs-http-client/src/object/patch/append-data.js b/packages/ipfs-http-client/src/object/patch/append-data.js
index fe94bf97ec..57dbcff542 100644
--- a/packages/ipfs-http-client/src/object/patch/append-data.js
+++ b/packages/ipfs-http-client/src/object/patch/append-data.js
@@ -22,7 +22,6 @@ module.exports = configure(api => {
     const signal = abortSignal(controller.signal, options.signal)
 
     const res = await api.post('object/patch/append-data', {
-      timeout: options.timeout,
       signal,
       searchParams: toUrlSearchParams({
         arg: `${cid}`,
diff --git a/packages/ipfs-http-client/src/object/patch/rm-link.js b/packages/ipfs-http-client/src/object/patch/rm-link.js
index 4c6faa26fc..bb9621dea8 100644
--- a/packages/ipfs-http-client/src/object/patch/rm-link.js
+++ b/packages/ipfs-http-client/src/object/patch/rm-link.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function rmLink (cid, dLink, options = {}) {
     const res = await api.post('object/patch/rm-link', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: [
diff --git a/packages/ipfs-http-client/src/object/patch/set-data.js b/packages/ipfs-http-client/src/object/patch/set-data.js
index 42d737d847..d47e3c36dc 100644
--- a/packages/ipfs-http-client/src/object/patch/set-data.js
+++ b/packages/ipfs-http-client/src/object/patch/set-data.js
@@ -22,7 +22,6 @@ module.exports = configure(api => {
     const signal = abortSignal(controller.signal, options.signal)
 
     const res = await api.post('object/patch/set-data', {
-      timeout: options.timeout,
       signal,
       searchParams: toUrlSearchParams({
         arg: [
diff --git a/packages/ipfs-http-client/src/object/stat.js b/packages/ipfs-http-client/src/object/stat.js
index 4d7077a1f7..b5111620cc 100644
--- a/packages/ipfs-http-client/src/object/stat.js
+++ b/packages/ipfs-http-client/src/object/stat.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function stat (cid, options = {}) {
     const res = await api.post('object/stat', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: `${cid}`,
diff --git a/packages/ipfs-http-client/src/pin/add-all.js b/packages/ipfs-http-client/src/pin/add-all.js
index 3a820e2674..c47ebc79d1 100644
--- a/packages/ipfs-http-client/src/pin/add-all.js
+++ b/packages/ipfs-http-client/src/pin/add-all.js
@@ -17,7 +17,6 @@ module.exports = configure(api => {
   async function * addAll (source, options = {}) {
     for await (const { path, recursive, metadata } of normaliseInput(source)) {
       const res = await api.post('pin/add', {
-        timeout: options.timeout,
         signal: options.signal,
         searchParams: toUrlSearchParams({
           ...options,
diff --git a/packages/ipfs-http-client/src/pin/ls.js b/packages/ipfs-http-client/src/pin/ls.js
index 859f1499dd..531d99a511 100644
--- a/packages/ipfs-http-client/src/pin/ls.js
+++ b/packages/ipfs-http-client/src/pin/ls.js
@@ -41,7 +41,6 @@ module.exports = configure(api => {
     }
 
     const res = await api.post('pin/ls', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         ...options,
diff --git a/packages/ipfs-http-client/src/pin/remote/service.js b/packages/ipfs-http-client/src/pin/remote/service.js
index a6892955e9..12364e273a 100644
--- a/packages/ipfs-http-client/src/pin/remote/service.js
+++ b/packages/ipfs-http-client/src/pin/remote/service.js
@@ -95,7 +95,6 @@ Service.prototype.add = async function add (name, options) {
  */
 Service.prototype.rm = async function rm (name, options = {}) {
   await this.client.post('pin/remote/service/rm', {
-    timeout: options.timeout,
     signal: options.signal,
     headers: options.headers,
     searchParams: toUrlSearchParams({
diff --git a/packages/ipfs-http-client/src/pin/rm-all.js b/packages/ipfs-http-client/src/pin/rm-all.js
index 4aed6af2c7..528006d48a 100644
--- a/packages/ipfs-http-client/src/pin/rm-all.js
+++ b/packages/ipfs-http-client/src/pin/rm-all.js
@@ -22,7 +22,6 @@ module.exports = configure(api => {
       if (recursive != null) searchParams.set('recursive', String(recursive))
 
       const res = await api.post('pin/rm', {
-        timeout: options.timeout,
         signal: options.signal,
         headers: options.headers,
         searchParams: toUrlSearchParams({
diff --git a/packages/ipfs-http-client/src/ping.js b/packages/ipfs-http-client/src/ping.js
index 95d36969c2..12bc35c6ff 100644
--- a/packages/ipfs-http-client/src/ping.js
+++ b/packages/ipfs-http-client/src/ping.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function * ping (peerId, options = {}) {
     const res = await api.post('ping', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: `${peerId}`,
diff --git a/packages/ipfs-http-client/src/pubsub/ls.js b/packages/ipfs-http-client/src/pubsub/ls.js
index 282ac0ef15..b1e05c7c7b 100644
--- a/packages/ipfs-http-client/src/pubsub/ls.js
+++ b/packages/ipfs-http-client/src/pubsub/ls.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function ls (options = {}) {
     const { Strings } = await (await api.post('pubsub/ls', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/pubsub/peers.js b/packages/ipfs-http-client/src/pubsub/peers.js
index 06ac54e541..7772cff835 100644
--- a/packages/ipfs-http-client/src/pubsub/peers.js
+++ b/packages/ipfs-http-client/src/pubsub/peers.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function peers (topic, options = {}) {
     const res = await api.post('pubsub/peers', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: topic,
diff --git a/packages/ipfs-http-client/src/pubsub/publish.js b/packages/ipfs-http-client/src/pubsub/publish.js
index b97f00024a..52bbb84391 100644
--- a/packages/ipfs-http-client/src/pubsub/publish.js
+++ b/packages/ipfs-http-client/src/pubsub/publish.js
@@ -26,7 +26,6 @@ module.exports = configure(api => {
     const signal = abortSignal(controller.signal, options.signal)
 
     const res = await api.post('pubsub/pub', {
-      timeout: options.timeout,
       signal,
       searchParams,
       ...(
diff --git a/packages/ipfs-http-client/src/pubsub/subscribe.js b/packages/ipfs-http-client/src/pubsub/subscribe.js
index df34623fde..86342b9b50 100644
--- a/packages/ipfs-http-client/src/pubsub/subscribe.js
+++ b/packages/ipfs-http-client/src/pubsub/subscribe.js
@@ -42,7 +42,6 @@ module.exports = (options, subsTracker) => {
 
       // Do this async to not block Firefox
       api.post('pubsub/sub', {
-        timeout: options.timeout,
         signal: options.signal,
         searchParams: toUrlSearchParams({
           arg: topic,
diff --git a/packages/ipfs-http-client/src/refs/index.js b/packages/ipfs-http-client/src/refs/index.js
index 6f610d7fd1..310a0666ec 100644
--- a/packages/ipfs-http-client/src/refs/index.js
+++ b/packages/ipfs-http-client/src/refs/index.js
@@ -19,7 +19,6 @@ module.exports = configure((api, opts) => {
     const argsArr = Array.isArray(args) ? args : [args]
 
     const res = await api.post('refs', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: argsArr.map(arg => `${arg instanceof Uint8Array ? CID.decode(arg) : arg}`),
diff --git a/packages/ipfs-http-client/src/refs/local.js b/packages/ipfs-http-client/src/refs/local.js
index 9ca8facc81..5a59f7a347 100644
--- a/packages/ipfs-http-client/src/refs/local.js
+++ b/packages/ipfs-http-client/src/refs/local.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function * refsLocal (options = {}) {
     const res = await api.post('refs/local', {
-      timeout: options.timeout,
       signal: options.signal,
       transform: toCamel,
       searchParams: toUrlSearchParams(options),
diff --git a/packages/ipfs-http-client/src/repo/gc.js b/packages/ipfs-http-client/src/repo/gc.js
index 49f4805069..e355d216a1 100644
--- a/packages/ipfs-http-client/src/repo/gc.js
+++ b/packages/ipfs-http-client/src/repo/gc.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function * gc (options = {}) {
     const res = await api.post('repo/gc', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers,
diff --git a/packages/ipfs-http-client/src/repo/stat.js b/packages/ipfs-http-client/src/repo/stat.js
index a8bfa91d00..c62fdaf09b 100644
--- a/packages/ipfs-http-client/src/repo/stat.js
+++ b/packages/ipfs-http-client/src/repo/stat.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function stat (options = {}) {
     const res = await api.post('repo/stat', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/repo/version.js b/packages/ipfs-http-client/src/repo/version.js
index 0d64ea19d7..0861d1a3ac 100644
--- a/packages/ipfs-http-client/src/repo/version.js
+++ b/packages/ipfs-http-client/src/repo/version.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function version (options = {}) {
     const res = await (await api.post('repo/version', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/resolve.js b/packages/ipfs-http-client/src/resolve.js
index 77fbfb5f6a..b78a834564 100644
--- a/packages/ipfs-http-client/src/resolve.js
+++ b/packages/ipfs-http-client/src/resolve.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function resolve (path, options = {}) {
     const res = await api.post('resolve', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: path,
diff --git a/packages/ipfs-http-client/src/stats/bw.js b/packages/ipfs-http-client/src/stats/bw.js
index ef77cd4c4d..e2b2d168f9 100644
--- a/packages/ipfs-http-client/src/stats/bw.js
+++ b/packages/ipfs-http-client/src/stats/bw.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function * bw (options = {}) {
     const res = await api.post('stats/bw', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers,
diff --git a/packages/ipfs-http-client/src/stop.js b/packages/ipfs-http-client/src/stop.js
index 621a3b6b54..6e21b820af 100644
--- a/packages/ipfs-http-client/src/stop.js
+++ b/packages/ipfs-http-client/src/stop.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function stop (options = {}) {
     const res = await api.post('shutdown', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/swarm/addrs.js b/packages/ipfs-http-client/src/swarm/addrs.js
index e0880e5549..71be8fe0d1 100644
--- a/packages/ipfs-http-client/src/swarm/addrs.js
+++ b/packages/ipfs-http-client/src/swarm/addrs.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function addrs (options = {}) {
     const res = await api.post('swarm/addrs', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/swarm/connect.js b/packages/ipfs-http-client/src/swarm/connect.js
index 1a6e649a30..9a86724d3d 100644
--- a/packages/ipfs-http-client/src/swarm/connect.js
+++ b/packages/ipfs-http-client/src/swarm/connect.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function connect (addr, options = {}) {
     const res = await api.post('swarm/connect', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: addr,
diff --git a/packages/ipfs-http-client/src/swarm/disconnect.js b/packages/ipfs-http-client/src/swarm/disconnect.js
index 8e20d3e6ff..80481c98c9 100644
--- a/packages/ipfs-http-client/src/swarm/disconnect.js
+++ b/packages/ipfs-http-client/src/swarm/disconnect.js
@@ -14,7 +14,6 @@ module.exports = configure(api => {
    */
   async function disconnect (addr, options = {}) {
     const res = await api.post('swarm/disconnect', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams({
         arg: addr,
diff --git a/packages/ipfs-http-client/src/swarm/localAddrs.js b/packages/ipfs-http-client/src/swarm/localAddrs.js
index c1b3ae91bd..25736936bf 100644
--- a/packages/ipfs-http-client/src/swarm/localAddrs.js
+++ b/packages/ipfs-http-client/src/swarm/localAddrs.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function localAddrs (options = {}) {
     const res = await api.post('swarm/addrs/local', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/swarm/peers.js b/packages/ipfs-http-client/src/swarm/peers.js
index cb68ac5c5b..7f7bc1f309 100644
--- a/packages/ipfs-http-client/src/swarm/peers.js
+++ b/packages/ipfs-http-client/src/swarm/peers.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function peers (options = {}) {
     const res = await api.post('swarm/peers', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers
diff --git a/packages/ipfs-http-client/src/version.js b/packages/ipfs-http-client/src/version.js
index 0b15ae98a4..777421a8cd 100644
--- a/packages/ipfs-http-client/src/version.js
+++ b/packages/ipfs-http-client/src/version.js
@@ -15,7 +15,6 @@ module.exports = configure(api => {
    */
   async function version (options = {}) {
     const res = await api.post('version', {
-      timeout: options.timeout,
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       headers: options.headers