diff --git a/broker/src/mqtt.rs b/broker/src/mqtt.rs
index cd8a6a5..637b068 100644
--- a/broker/src/mqtt.rs
+++ b/broker/src/mqtt.rs
@@ -28,7 +28,8 @@ pub fn start_broker(
 
     let (mut link_tx, mut link_rx) = broker.link("localclient")?;
 
-    link_tx.subscribe("#").unwrap();
+    link_tx.subscribe(format!("+/{}", topics::HELLO));
+    link_tx.subscribe(format!("+/{}", topics::BYE));
 
     let auth_sender_ = auth_sender.clone();
     std::thread::spawn(move || {