diff --git a/satrs-example/src/main.rs b/satrs-example/src/main.rs
index f10b916..a752f06 100644
--- a/satrs-example/src/main.rs
+++ b/satrs-example/src/main.rs
@@ -150,12 +150,12 @@ fn main() {
     // in the sat-rs documentation.
     let mut event_handler = EventHandler::new(tm_sink_tx.clone(), event_rx, event_request_rx);
 
-    let (pus_test_tx, pus_test_rx) = mpsc::channel();
-    let (pus_event_tx, pus_event_rx) = mpsc::channel();
-    let (pus_sched_tx, pus_sched_rx) = mpsc::channel();
-    let (pus_hk_tx, pus_hk_rx) = mpsc::channel();
-    let (pus_action_tx, pus_action_rx) = mpsc::channel();
-    let (pus_mode_tx, pus_mode_rx) = mpsc::channel();
+    let (pus_test_tx, pus_test_rx) = mpsc::sync_channel(20);
+    let (pus_event_tx, pus_event_rx) = mpsc::sync_channel(10);
+    let (pus_sched_tx, pus_sched_rx) = mpsc::sync_channel(50);
+    let (pus_hk_tx, pus_hk_rx) = mpsc::sync_channel(50);
+    let (pus_action_tx, pus_action_rx) = mpsc::sync_channel(50);
+    let (pus_mode_tx, pus_mode_rx) = mpsc::sync_channel(50);
 
     let (_pus_action_reply_tx, pus_action_reply_rx) = mpsc::channel();
     let (pus_hk_reply_tx, pus_hk_reply_rx) = mpsc::sync_channel(50);
diff --git a/satrs-example/src/pus/mod.rs b/satrs-example/src/pus/mod.rs
index a565713..c575566 100644
--- a/satrs-example/src/pus/mod.rs
+++ b/satrs-example/src/pus/mod.rs
@@ -22,7 +22,7 @@ use satrs_example::config::components::PUS_ROUTING_SERVICE;
 use satrs_example::config::{tmtc_err, CustomPusServiceId};
 use satrs_example::TimestampHelper;
 use std::fmt::Debug;
-use std::sync::mpsc::{self, Sender};
+use std::sync::mpsc;
 
 pub mod action;
 pub mod event;
@@ -41,13 +41,13 @@ pub fn create_verification_reporter(owner_id: ComponentId, apid: Apid) -> Verifi
 
 /// Simple router structure which forwards PUS telecommands to dedicated handlers.
 pub struct PusTcMpscRouter {
-    pub test_tc_sender: Sender<EcssTcAndToken>,
-    pub event_tc_sender: Sender<EcssTcAndToken>,
-    pub sched_tc_sender: Sender<EcssTcAndToken>,
-    pub hk_tc_sender: Sender<EcssTcAndToken>,
+    pub test_tc_sender: mpsc::SyncSender<EcssTcAndToken>,
+    pub event_tc_sender: mpsc::SyncSender<EcssTcAndToken>,
+    pub sched_tc_sender: mpsc::SyncSender<EcssTcAndToken>,
+    pub hk_tc_sender: mpsc::SyncSender<EcssTcAndToken>,
     #[allow(dead_code)]
-    pub action_tc_sender: Sender<EcssTcAndToken>,
-    pub mode_tc_sender: Sender<EcssTcAndToken>,
+    pub action_tc_sender: mpsc::SyncSender<EcssTcAndToken>,
+    pub mode_tc_sender: mpsc::SyncSender<EcssTcAndToken>,
 }
 
 pub struct PusTcDistributor {