diff --git a/src/client.rs b/src/client.rs
index b8604b0..85e5ea2 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -136,6 +136,8 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_toke
         tokio::select! {
             _ = close_token.cancelled() => {
                 info!("Cancellation token has been thrown");
+                dev_read_task.join();
+                sock_read_task.join();
                 return;
             }
             rr = rx.recv() => {