diff --git a/Cargo.lock b/Cargo.lock
index a8b4dd5..53c829e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -541,6 +541,7 @@ name = "proxy"
 version = "0.1.0"
 dependencies = [
  "cfg-if",
+ "log",
  "proxy-common",
  "prudpv0",
  "prudpv1",
diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml
index f2a5974..fa56ab2 100644
--- a/proxy/Cargo.toml
+++ b/proxy/Cargo.toml
@@ -10,6 +10,7 @@ prudpv1 = { path = "../prudpv1", optional = true }
 proxy-common = { path = "../proxy-common" }
 cfg-if = "1.0.4"
 rnex-core = { path = "../rnex-core", version = "0.1.1" }
+log = "0.4.25"
 
 [features]
 prudpv0 = ["dep:prudpv0"]
diff --git a/proxy/src/insecure.rs b/proxy/src/insecure.rs
index b109d14..4a32adf 100644
--- a/proxy/src/insecure.rs
+++ b/proxy/src/insecure.rs
@@ -1,13 +1,17 @@
-use proxy_common::ProxyStartupParam;
+use std::process::abort;
+
+use proxy::edge_node_dc_callback;
+use proxy_common::{ProxyStartupParam, setup_edge_node_connection};
 use rnex_core::common::setup;
 
 #[tokio::main]
 async fn main() {
     setup();
 
-    proxy::start_insecure(
-        ProxyStartupParam::new(proxy_common::ProxyType::Insecure)
-            .expect("unable to get startup parameters"),
-    )
-    .await;
+    let param = ProxyStartupParam::new(proxy_common::ProxyType::Insecure)
+        .expect("unable to get startup parameters");
+
+    setup_edge_node_connection(&param, edge_node_dc_callback).await;
+
+    proxy::start_insecure(param).await;
 }
diff --git a/proxy/src/lib.rs b/proxy/src/lib.rs
index 7120adc..2c52a9a 100644
--- a/proxy/src/lib.rs
+++ b/proxy/src/lib.rs
@@ -1,4 +1,7 @@
+use std::process::abort;
+
 use cfg_if::cfg_if;
+use log::error;
 
 cfg_if! {
     if #[cfg(feature = "prudpv0")]{
@@ -9,3 +12,8 @@ cfg_if! {
         compile_error!("no proxy type has been set");
     }
 }
+
+pub fn edge_node_dc_callback() {
+    error!("disconnected from node holder, aborting!");
+    abort()
+}
diff --git a/proxy/src/secure.rs b/proxy/src/secure.rs
index 8990d74..6d42c87 100644
--- a/proxy/src/secure.rs
+++ b/proxy/src/secure.rs
@@ -1,12 +1,14 @@
-use proxy_common::ProxyStartupParam;
+use proxy::edge_node_dc_callback;
+use proxy_common::{ProxyStartupParam, setup_edge_node_connection};
 use rnex_core::common::setup;
 
 #[tokio::main]
 async fn main() {
     setup();
-    proxy::start_secure(
-        ProxyStartupParam::new(proxy_common::ProxyType::Secure)
-            .expect("unable to get startup parameters"),
-    )
-    .await;
+
+    let param = ProxyStartupParam::new(proxy_common::ProxyType::Secure)
+        .expect("unable to get startup parameters");
+
+    setup_edge_node_connection(&param, edge_node_dc_callback).await;
+    proxy::start_secure(param).await;
 }
diff --git a/prudpv1/src/executables/proxy_insecure.rs b/prudpv1/src/executables/proxy_insecure.rs
index 7a08283..0bde918 100644
--- a/prudpv1/src/executables/proxy_insecure.rs
+++ b/prudpv1/src/executables/proxy_insecure.rs
@@ -21,7 +21,7 @@ use tokio::task;
 use tokio::time::sleep;
 
 pub async fn start() {
-    let conn = tokio::net::TcpStream::connect(&*EDGE_NODE_HOLDER)
+    /*let conn = tokio::net::TcpStream::connect(&*EDGE_NODE_HOLDER)
         .await
         .unwrap();
 
@@ -36,7 +36,7 @@ pub async fn start() {
 
     let conn = new_rmc_gateway_connection(conn, |r| {
         Arc::new(OnlyRemote::<RemoteEdgeNodeHolder>::new(r))
-    });
+    });*/
 
     let (router_secure, _) = Router::new(SocketAddrV4::new(*OWN_IP_PRIVATE, *SERVER_PORT))
         .await
diff --git a/prudpv1/src/executables/proxy_secure.rs b/prudpv1/src/executables/proxy_secure.rs
index 12abf64..2045cfd 100644
--- a/prudpv1/src/executables/proxy_secure.rs
+++ b/prudpv1/src/executables/proxy_secure.rs
@@ -23,23 +23,6 @@ use tokio::task;
 use tokio::time::sleep;
 
 pub async fn start() {
-    let conn = tokio::net::TcpStream::connect(&*EDGE_NODE_HOLDER)
-        .await
-        .unwrap();
-
-    let conn: SplittableBufferConnection = conn.into();
-
-    conn.send(
-        Register(SocketAddrV4::new(*OWN_IP_PUBLIC, *SERVER_PORT))
-            .to_data()
-            .unwrap(),
-    )
-    .await;
-
-    let conn = new_rmc_gateway_connection(conn, |r| {
-        Arc::new(OnlyRemote::<RemoteEdgeNodeHolder>::new(r))
-    });
-
     let (router_secure, _) = Router::new(SocketAddrV4::new(*OWN_IP_PRIVATE, *SERVER_PORT))
         .await
         .expect("unable to start router");