diff --git a/source/birchwood/client/receiver.d b/source/birchwood/client/receiver.d
index a0bafa2..185bc28 100644
--- a/source/birchwood/client/receiver.d
+++ b/source/birchwood/client/receiver.d
@@ -244,5 +244,8 @@ public final class ReceiverThread : Thread
         // TODO: See above notes about libsnooze behaviour due
         // ... to usage in our context
         receiveEvent.notifyAll();
+
+        // Wait on the manager thread to end
+        join();
     }
 }
\ No newline at end of file
diff --git a/source/birchwood/client/sender.d b/source/birchwood/client/sender.d
index 2af5a1e..6d5382e 100644
--- a/source/birchwood/client/sender.d
+++ b/source/birchwood/client/sender.d
@@ -149,5 +149,8 @@ public final class SenderThread : Thread
         // TODO: See above notes about libsnooze behaviour due
         // ... to usage in our context
         sendEvent.notifyAll();
+
+        // Wait on the manager thread to end
+        join();
     }
 }
\ No newline at end of file