diff --git a/source/birchwood/client/receiver.d b/source/birchwood/client/receiver.d
index b372a57..3109b4f 100644
--- a/source/birchwood/client/receiver.d
+++ b/source/birchwood/client/receiver.d
@@ -248,6 +248,7 @@ public final class ReceiverThread : Thread
         // Wait on the manager thread to end
         join();
 
-        // TODO: Call dispose() on eventy event
+        // Dispose the eventy event (TODO: We could do this then join for same effect)
+        receiveEvent.dispose();
     }
 }
\ No newline at end of file
diff --git a/source/birchwood/client/sender.d b/source/birchwood/client/sender.d
index 6f29969..eef34e9 100644
--- a/source/birchwood/client/sender.d
+++ b/source/birchwood/client/sender.d
@@ -153,6 +153,7 @@ public final class SenderThread : Thread
         // Wait on the manager thread to end
         join();
 
-        // TODO: Call dispose() on eventy event
+        // Dispose the eventy event (TODO: We could do this then join for same effect)
+        sendEvent.dispose();
     }
 }
\ No newline at end of file