diff --git a/soar_bus.py b/soar_bus.py
index b4e2b5098d78967023bb8dd4c7f5be9588a57bb9..6f5790ba6876b37dd8d46efe2ed2517948042262 100644
--- a/soar_bus.py
+++ b/soar_bus.py
@@ -118,19 +118,12 @@ def run_client(client_id, executor):
         )
         THREADS[f"{client_id}-broadcast"] = thread
 
-        # subscribe
-        thread = executor.submit(
-            subscribe,
+        subscribe(
             f"{client_id}-inbox",
             EXCHANGES.get("publish"),
-            client["subscription"],  # topic
-        )
-        THREADS[f"{client_id}-inbox-published"] = thread
-
-        thread = executor.submit(
-            subscribe, f"{client_id}-inbox", EXCHANGES.get("broadcast")
+            client["subscription"],
         )
-        THREADS[f"{client_id}-inbox-broadcast"] = thread
+        subscribe(f"{client_id}-inbox", EXCHANGES.get("broadcast"))
         if client_id not in RUNNING_CLIENTS:
             RUNNING_CLIENTS.append(client_id)
         running = True