diff --git a/keyserver/addons/rust-node-addon/src/lib.rs b/keyserver/addons/rust-node-addon/src/lib.rs
index 0de42eacc..872a3a424 100644
--- a/keyserver/addons/rust-node-addon/src/lib.rs
+++ b/keyserver/addons/rust-node-addon/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod identity_client;
-pub mod tunnelbroker_client;
 
 #[macro_use]
 extern crate napi_derive;
diff --git a/keyserver/addons/rust-node-addon/src/tunnelbroker_client.rs b/keyserver/addons/rust-node-addon/src/tunnelbroker_client.rs
deleted file mode 100644
index ed0bad963..000000000
--- a/keyserver/addons/rust-node-addon/src/tunnelbroker_client.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use lazy_static::lazy_static;
-use napi::threadsafe_function::{
-  ThreadsafeFunction, ThreadsafeFunctionCallMode,
-};
-use napi_derive::napi;
-use std::env::var;
-use tokio::sync::mpsc;
-use tokio_stream::{wrappers::ReceiverStream, StreamExt};
-use tonic::Request;
-use tracing::error;
-
-use tunnelbroker::tunnelbroker_pb::message_to_client::Data::MessagesToDeliver;
-use tunnelbroker_client as tunnelbroker;
-
-lazy_static! {
-  static ref TUNNELBROKER_SERVICE_ADDR: String =
-    var("COMM_TUNNELBROKER_SERVICE_ADDR")
-      .unwrap_or("https://[::1]:50051".to_string());
-}
-
-#[napi]
-pub struct TunnelbrokerClient {
-  tx: mpsc::Sender<tunnelbroker::tunnelbroker_pb::MessageToTunnelbroker>,
-}
-
-#[napi]
-impl TunnelbrokerClient {
-  #[napi(constructor)]
-  pub fn new(on_receive_callback: ThreadsafeFunction<String>) -> Self {
-    let mut client =
-      tunnelbroker::initialize_client(TUNNELBROKER_SERVICE_ADDR.to_string());
-    let (tx, rx) = mpsc::channel(1);
-    let stream = ReceiverStream::new(rx);
-
-    // Spawning asynchronous Tokio task for handling incoming messages from the client
-    // and calling the callback function with the received payload
-    tunnelbroker::RUNTIME.spawn({
-      async move {
-        let response = client
-          .messages_stream(Request::new(stream))
-          .await
-          .expect("Failed to receive messages stream from Tunnelbroker");
-        let mut resp_stream = response.into_inner();
-        while let Some(received) = resp_stream.next().await {
-          if let Some(message_data) =
-            received.expect("Error on getting messages data").data
-          {
-            match message_data {
-              MessagesToDeliver(messages_to_send) => {
-                for message in messages_to_send.messages {
-                  on_receive_callback.call(
-                    Ok(message.payload),
-                    ThreadsafeFunctionCallMode::NonBlocking,
-                  );
-                }
-              }
-              _ => {
-                error!("Received an unexpected message type");
-              }
-            }
-          }
-        }
-      }
-    });
-    TunnelbrokerClient { tx }
-  }
-}