diff --git a/src/Servers/Chat/src/Application/Client.cs b/src/Servers/Chat/src/Application/Client.cs
index 999072d09..580d17a82 100644
--- a/src/Servers/Chat/src/Application/Client.cs
+++ b/src/Servers/Chat/src/Application/Client.cs
@@ -59,14 +59,10 @@ protected override void OnDisconnected()
                 new QuitHandler(this, req).Handle();
                 Info.IsLoggedIn = false;
             }
+            StorageOperation.Persistance.RemoveClient(this);
             base.OnDisconnected();
         }
         protected override ISwitcher CreateSwitcher(object buffer) => new CmdSwitcher(this, UniSpyEncoding.GetString((byte[])buffer));
         public RemoteClient GetRemoteClient() => _remoteClient;
-        protected override void OnConnected()
-        {
-            StorageOperation.Persistance.RemoveClient(this);
-            base.OnConnected();
-        }
     }
 }
\ No newline at end of file