diff --git a/signer/src/ws_server/mod.rs b/signer/src/ws_server/mod.rs
index 0a4499af8..c987d7a87 100644
--- a/signer/src/ws_server/mod.rs
+++ b/signer/src/ws_server/mod.rs
@@ -116,7 +116,8 @@ impl Server {
 				q.start_listening(|_message| {
 					// TODO [ToDr] Some better structure here for messages.
 					broadcaster.send("new_message").unwrap();
-				}).expect("It's the only place we are running start_listening. It shouldn't fail.")
+				}).expect("It's the only place we are running start_listening. It shouldn't fail.");
+				broadcaster.shutdown().expect("Broadcaster should close gently.")
 			}).unwrap()
 		});