diff --git a/shoutbox.py b/shoutbox.py
index 24dc4ea..3b02689 100644
--- a/shoutbox.py
+++ b/shoutbox.py
@@ -36,6 +36,7 @@ class Shoutbox(object):
         logging.debug("STOP: Halt all irc user threads")
         for client in self.irc_clients:
             self.irc_clients[client][0].stop()
+            self.irc_clients.pop(client)
         self._handler.join()
         logging.debug("STOP: Shoutbox thread closed")