diff --git a/Cargo.lock b/Cargo.lock
index a844a4dab7..c09abbde73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -544,16 +544,12 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 [[package]]
 name = "electrsd"
 version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc62235dfe2106193945330b1fe38569e59cee83a8792a0bd98c3913b51b297c"
+source = "git+https://github.com/realeinherjar/electrsd?branch=einherjar/optional-download#138e874a27d89ca468bdc688a6e3c54bad9a71da"
 dependencies = [
- "bitcoin_hashes 0.12.0",
  "bitcoind",
  "electrum-client 0.15.1",
  "log",
- "minreq",
  "nix",
- "zip",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0e1efc902f..0950e0fcc3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,25 @@
 [workspace]
 resolver = "2"
 members = [
-    "crates/bdk",
-    "crates/chain",
-    "crates/file_store",
-    "crates/electrum",
-    "crates/esplora",
-    "crates/bitcoind_rpc",
-    "example-crates/example_cli",
-    "example-crates/example_electrum",
-    "example-crates/example_esplora",
-    "example-crates/example_bitcoind_rpc_polling",
-    "example-crates/wallet_electrum",
-    "example-crates/wallet_esplora_blocking",
-    "example-crates/wallet_esplora_async",
-    "nursery/tmp_plan",
-    "nursery/coin_select"
+  "crates/bdk",
+  "crates/chain",
+  "crates/file_store",
+  "crates/electrum",
+  "crates/esplora",
+  "crates/bitcoind_rpc",
+  "example-crates/example_cli",
+  "example-crates/example_electrum",
+  "example-crates/example_esplora",
+  "example-crates/example_bitcoind_rpc_polling",
+  "example-crates/wallet_electrum",
+  "example-crates/wallet_esplora_blocking",
+  "example-crates/wallet_esplora_async",
+  "nursery/tmp_plan",
+  "nursery/coin_select",
 ]
 
 [workspace.package]
 authors = ["Bitcoin Dev Kit Developers"]
+
+[patch.crates-io]
+electrsd = { git = "https://github.com/realeinherjar/electrsd", branch = "einherjar/optional-download" }
diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml
index bc127c087a..3a61426489 100644
--- a/crates/esplora/Cargo.toml
+++ b/crates/esplora/Cargo.toml
@@ -22,7 +22,7 @@ bitcoin = { version = "0.30.0", optional = true, default-features = false }
 miniscript = { version = "10.0.0", optional = true, default-features = false }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-electrsd = { version= "0.25.0", features = ["bitcoind_25_0", "esplora_a33e97e1", "legacy"] }
+electrsd = { version = "0.25.0", features = ["esplora_a33e97e1", "legacy"] }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
 
 [features]