diff --git a/judge/bridge/judge_handler.py b/judge/bridge/judge_handler.py
index 8be69ea..1ff1af1 100644
--- a/judge/bridge/judge_handler.py
+++ b/judge/bridge/judge_handler.py
@@ -93,6 +93,7 @@ class JudgeHandler(ZlibPacketHandler):
 
     def on_disconnect(self):
         self._stop_ping.set()
+        self.judges.remove(self)
         if self.name is not None:
             self._disconnected()
         logger.info(