diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index 55e83b6f9..43ca7266a 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -167,8 +167,10 @@ class DelugeRPCProtocol(Protocol):
 
         """
 
-        # We need to remove this session from the authmanager
+        # We need to remove this session from various dicts
         del self.factory.authorized_sessions[self.transport.sessionno]
+        del self.factory.session_protocols[self.transport.sessionno]
+        del self.factory.interested_events[self.transport.sessionno]
 
         log.info("Deluge client disconnected: %s", reason.value)