diff --git a/server/server.php b/server/server.php
index 7b00552..39a0463 100644
--- a/server/server.php
+++ b/server/server.php
@@ -118,6 +118,7 @@ public function onClose(
                 }
             }
         }
+        unset($this->clients[$connection->getRemoteName()]);
     }
 
     public function onDisconnect(
@@ -133,6 +134,7 @@ public function onDisconnect(
                 }
             }
         }
+        unset($this->clients[$connection->getRemoteName()]);
     }
     
     public function onError(
@@ -151,6 +153,7 @@ public function onError(
                 }
             }
         }
+        unset($this->clients[$connection->getRemoteName()]);
     }
 
     public function createServer() {
@@ -225,4 +228,4 @@ public function createServer() {
     }
 }
 
-$server = new SolidPubSub($options);
\ No newline at end of file
+$server = new SolidPubSub($options);