diff --git a/server/masterserver/app.cc b/server/masterserver/app.cc
index de1d1a8..e4cea57 100755
--- a/server/masterserver/app.cc
+++ b/server/masterserver/app.cc
@@ -98,6 +98,7 @@ void App::Init(int argc, char* argv[])
     JsonDataMgr::Instance()->Init();
     uuid.SetMachineId((node_id - 1) * MAX_NODE_ID + instance_id);
     GGListener::Instance()->Init();
+    GSMgr::Instance()->Init();
 
     a8::UdpLog::Instance()->Info("masterserver starting instance_id:%d pid:%d", {instance_id, getpid()});
     {
@@ -119,7 +120,8 @@ void App::UnInit()
     if (terminated) {
         return;
     }
-    GGListener::Instance()->Init();
+    GSMgr::Instance()->UnInit();
+    GGListener::Instance()->UnInit();
     JsonDataMgr::Instance()->UnInit();
     f8::MsgQueue::Instance()->UnInit();
     a8::Timer::Instance()->UnInit();