diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 633c50e5..3ae0785d 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -748,16 +748,16 @@ void RoomMgr::SendGetBattleData(int mode,
     std::shared_ptr<std::vector<BattleDataContext>> result = std::make_shared<std::vector<BattleDataContext>>();
     bool is_old_version = false;
     for (auto& msg : join_msgs) {
-        if (msg->proto_version() < 2022032201) {
-            is_old_version = true;
-            break;
-        }
         BattleDataContext context;
         context.join_msg = msg;
         context.battle_uuid = App::Instance()->NewUuid();
         context.errcode = 100;
         context.errmsg = "";
         result->push_back(context);
+        if (msg->proto_version() < 2022032201) {
+            is_old_version = true;
+            break;
+        }
     }
 #ifdef DEBUG
     if (is_old_version) {