diff --git a/src/irclib.py b/src/irclib.py
index be14ff791..ddc6a47b4 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -402,6 +402,7 @@ class IrcState(IrcCommandDispatcher):
     def doQuit(self, irc, msg):
         for channel in self.channels.itervalues():
             channel.removeUser(msg.nick)
+        del self.nicksToHostmasks[msg.nick]
 
     def doTopic(self, irc, msg):
         if len(msg.args) == 1: