diff --git a/Cargo.lock b/Cargo.lock
index d4c4f5970..f6ce8941d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -319,7 +319,7 @@ dependencies = [
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-http-server 4.0.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git)",
+ "jsonrpc-http-server 5.0.0 (git+https://github.com/debris/jsonrpc-http-server.git)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-status 0.1.1 (git+https://github.com/tomusdrw/parity-status.git)",
  "parity-wallet 0.1.0 (git+https://github.com/tomusdrw/parity-wallet.git)",
diff --git a/parity/main.rs b/parity/main.rs
index 8dcd0c067..7ea8282f3 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -67,7 +67,7 @@ use daemonize::Daemonize;
 use number_prefix::{binary_prefix, Standalone, Prefixed};
 #[cfg(feature = "rpc")]
 use rpc::Server as RpcServer;
-use webapp::WebappServer;
+use webapp::Listening as WebappServer;
 
 mod price_info;
 
@@ -324,7 +324,7 @@ fn setup_webapp_server(
 ) -> WebappServer {
 	use rpc::v1::*;
 
-	let server = WebappServer::new();
+	let server = webapp::WebappServer::new();
 	server.add_delegate(Web3Client::new().to_delegate());
 	server.add_delegate(NetClient::new(&sync).to_delegate());
 	server.add_delegate(EthClient::new(&client, &sync, &secret_store, &miner).to_delegate());
@@ -334,7 +334,7 @@ fn setup_webapp_server(
 	match start_result {
 		Err(webapp::WebappServerError::IoError(err)) => die_with_io_error(err),
 		Err(e) => die!("{:?}", e),
-		Ok(handle) => Box::new(handle),
+		Ok(handle) => handle,
 	}
 
 }
diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml
index b377bb991..28df2b8f8 100644
--- a/webapp/Cargo.toml
+++ b/webapp/Cargo.toml
@@ -10,7 +10,7 @@ authors = ["Ethcore <admin@ethcore.io"]
 [dependencies]
 log = "0.3"
 jsonrpc-core = "2.0"
-jsonrpc-http-server = { git = "https://github.com/tomusdrw/jsonrpc-http-server.git" }
+jsonrpc-http-server = { git = "https://github.com/debris/jsonrpc-http-server.git" }
 hyper = { version = "0.8", default-features = false }
 iron = { version = "0.3" }
 ethcore-rpc = { path = "../rpc" }
diff --git a/webapp/src/router/mod.rs b/webapp/src/router/mod.rs
index fad8593b9..700149307 100644
--- a/webapp/src/router/mod.rs
+++ b/webapp/src/router/mod.rs
@@ -36,7 +36,7 @@ impl hyper::server::Handler for Router {
 				self.pages.get(url).unwrap().handle(req, res);
 			}
 			_ if req.method == hyper::method::Method::Post => {
-				self.rpc.handle(req, res)
+				// self.rpc.handle(req, res)
 			},
 			_ => self.main_page.handle(req, res),
 		}