1 files changed, 8 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index ec05a7460..8ab79ae25 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -611,6 +611,9 @@ void Client::gameClear()
     if (chatHandler)
         chatHandler->clear();
 
+    if (charServerHandler)
+        charServerHandler->clear();
+
     delete2(ipc);
 
 #ifdef USE_MUMBLE
@@ -959,6 +962,11 @@ int Client::gameExec()
                 if (!settings.options.skipUpdate)
                     UpdaterWindow::unloadMods(settings.oldUpdates + "/fix/");
             }
+            else if (mOldState == STATE_CHAR_SELECT)
+            {
+                if (mState != STATE_CHANGEPASSWORD)
+                    charServerHandler->clear();
+            }
 
             mOldState = mState;