diff --git a/src/client.rs b/src/client.rs
index fb8ec71..b84e226 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -141,8 +141,8 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_toke
                 info!("Cancellation token has been thrown");
                 sr_cancel.cancel();
                 dr_cancel.cancel();
-                dev_read_task.await;
-                sock_read_task.await;
+                //dev_read_task.await;
+                //sock_read_task.await;
                 return;
             }
             rr = rx.recv() => {
diff --git a/src/main.rs b/src/main.rs
index f8bfeb6..7e28f20 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -75,7 +75,7 @@ mod jni {
         
             let exit_code = match tokio::runtime::Builder::new_multi_thread().enable_all().build() {
                 Err(_e) => -3,
-                Ok(rt) => { rt.spawn(main_loop); -4 } //spawn
+                Ok(rt) => { rt.block_on(main_loop); -4 } //spawn
             };
         
             Ok(exit_code)