diff --git a/ErgometerServer/ClientThread.cs b/ErgometerServer/ClientThread.cs
index cb43f8c..4215470 100644
--- a/ErgometerServer/ClientThread.cs
+++ b/ErgometerServer/ClientThread.cs
@@ -112,6 +112,8 @@ namespace ErgometerServer
                         throw new FormatException("Unknown command");
                 }
             }
+
+            server.RemoveActiveSession(this);
         }
 
         public void SendToClient(NetCommand command)
diff --git a/ErgometerServer/Server.cs b/ErgometerServer/Server.cs
index 9609e71..d646639 100644
--- a/ErgometerServer/Server.cs
+++ b/ErgometerServer/Server.cs
@@ -28,7 +28,6 @@ namespace ErgometerServer
             FileHandler.CheckStorage();
 
             users = FileHandler.LoadUsers();
-
             clients = new List<ClientThread>();
 
             TcpListener listener = new TcpListener(NetHelper.GetIP("127.0.0.1"), 8888);
@@ -157,6 +156,11 @@ namespace ErgometerServer
             return sessions;
         }
 
+        internal void RemoveActiveSession(ClientThread clientThread)
+        {
+            clients.Remove(clientThread);
+        }
+
         private string GeneratePassword(int len = 8)
         {
             string pass = "";