diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 82b0994..d93d76a 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -13,7 +13,7 @@ void RawTeamMember::FillMFMatchTeamMember(cs::MFMatchTeamMember* p)
     p->set_account_id(msg.account_id());
     p->set_name(msg.name());
     p->set_avatar_url(msg.avatar_url());
-    if (state == kMatchReadying) {
+    if (choose_hero_times > 0) {
         p->set_hero_id(0);
     } else {
         p->set_hero_id(msg.hero_id());
@@ -84,7 +84,7 @@ void MatchTeam::_CMMatchChoose(f8::MsgHdr& hdr, const cs::CMMatchChoose& msg)
         *member->msg.mutable_weapons() = msg.weapons();
         *member->msg.mutable_skins() = msg.skins();
         *member->msg.mutable_skill_list() = msg.skill_list();
-        member->state = kMatchPrepare;
+        ++member->choose_hero_times;
     }
 }
 
diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h
index 4f80096..f81f414 100644
--- a/server/gameserver/matchteam.h
+++ b/server/gameserver/matchteam.h
@@ -36,7 +36,7 @@ struct RawTeamMember
     bool is_robot = false;
     bool is_leader = false;
     int state = kMatchReadying;
-    int choose_hero_tiems = 0;
+    int choose_hero_times = 0;
     MetaData::Robot* robot_meta = nullptr;
     void FillMFMatchTeamMember(cs::MFMatchTeamMember* msg);
     void InitRobot();