diff --git a/Cargo.lock b/Cargo.lock
index 781b2c7f02b50..f43958dad28a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5082,7 +5082,7 @@ dependencies = [
  "tempo-primitives",
  "thiserror 2.0.18",
  "tokio",
- "tokio-tungstenite 0.28.0",
+ "tokio-tungstenite 0.29.0",
  "toml",
  "tower",
  "tracing",
@@ -10854,7 +10854,7 @@ dependencies = [
  "solar-config",
  "solar-data-structures",
  "solar-macros",
- "thiserror 2.0.18",
+ "thiserror 1.0.69",
  "tracing",
  "unicode-width 0.2.2",
 ]
@@ -11187,7 +11187,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 1.0.69",
  "url",
  "zip",
 ]
@@ -11779,8 +11779,12 @@ checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c"
 dependencies = [
  "futures-util",
  "log",
+ "rustls",
+ "rustls-pki-types",
  "tokio",
+ "tokio-rustls",
  "tungstenite 0.29.0",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -12174,6 +12178,8 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.9.4",
+ "rustls",
+ "rustls-pki-types",
  "sha1",
  "thiserror 2.0.18",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 253ed6afdf6fe..07e17f5051f91 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -487,7 +487,7 @@ soldeer-core = { version = "=0.10.1", features = ["serde"] }
 strum = "0.27"
 tempfile = "3.23"
 tokio = "1"
-tokio-tungstenite = { version = "0.28", features = ["rustls-tls-webpki-roots"] }
+tokio-tungstenite = { version = "0.29", features = ["rustls-tls-webpki-roots"] }
 toml = "0.9"
 toml_edit = "0.24"
 tower = "0.5"
diff --git a/crates/anvil/server/src/handler.rs b/crates/anvil/server/src/handler.rs
index 250c486986240..95659d9eefbf6 100644
--- a/crates/anvil/server/src/handler.rs
+++ b/crates/anvil/server/src/handler.rs
@@ -49,7 +49,9 @@ pub async fn handle_request<Handler: RpcHandler>(
         Request::Single(call) => handle_call(call, handler).await.map(Response::Single),
         Request::Batch(calls) => {
             if calls.is_empty() {
-                return Some(Response::error(RpcError::invalid_request()));
+                return Some(Response::Batch(vec![anvil_rpc::response::RpcResponse::from(
+                    RpcError::invalid_request(),
+                )]));
             }
             future::join_all(calls.into_iter().map(move |call| handle_call(call, handler.clone())))
                 .map(responses_as_batch)