diff --git a/client/src/client.rs b/client/src/client.rs
index 93ed219..aafecdb 100644
--- a/client/src/client.rs
+++ b/client/src/client.rs
@@ -213,7 +213,7 @@ impl ClientBuilder {
 }
 
 pub struct Client<DB: Database, N: ConsensusNetworkInterface> {
-    node: Node<N>,
+    node: Arc<RwLock<Node<N>>>,
     #[cfg(not(target_arch = "wasm32"))]
     rpc: Option<Rpc<N>>,
     db: DB,
diff --git a/client/src/rpc.rs b/client/src/rpc.rs
index 350dfca..513d7aa 100644
--- a/client/src/rpc.rs
+++ b/client/src/rpc.rs
@@ -23,13 +23,13 @@ use common::{
 use execution::types::{CallOpts, ExecutionBlock};
 
 pub struct Rpc<N: ConsensusNetworkInterface> {
-    node: Node<N>,
+    node: Arc<RwLock<Node<N>>>,
     handle: Option<HttpServerHandle>,
     port: u16,
 }
 
 impl<N: ConsensusNetworkInterface> Rpc<N> {
-    pub fn new(node: Node<N>, port: u16) -> Self {
+    pub fn new(node: Arc<RwLock<Node<N>>>, port: u16) -> Self {
         Rpc {
             node,
             handle: None,
@@ -126,7 +126,7 @@ trait NetRpc {
 }
 
 struct RpcInner<N: ConsensusNetworkInterface> {
-    node: Node<N>,
+    node: Arc<RwLock<Node<N>>>,
     port: u16,
 }