diff --git a/shared/db/GVGTeam.ts b/shared/db/GVGTeam.ts
index 2a695302d..b7573566b 100644
--- a/shared/db/GVGTeam.ts
+++ b/shared/db/GVGTeam.ts
@@ -214,9 +214,9 @@ export default class GVGTeam extends BaseModel {
     public static async initRobots(configId: number, groupKey: string, cityId: number, dicPoints: DicGVGAreaPoint[], lv: number) {
         let teams: GVGTeamType[] = [];
         for(let { pointId, areaId, name, head, spine, ce, durability } of dicPoints) {
-            let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ groupKey, cityId, areaId, pointId }, {
+            let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ configId, groupKey, cityId, areaId, pointId }, {
                 $setOnInsert: {teamCode: genCode(8), maxDurability: durability, roleName: name, head, spine, frame: EXTERIOR.EXTERIOR_FACECASE, lineupCe: ce, isRobot: true, lv, isBroken: false, startMoveTime: 0, stopMoveTime: 0, guildCode: '', leagueCode: '', leagueName: '', fromAreaId: areaId, roleId: GVG_ROBOT,
-                }, $set: { configId, durability }
+                }, $set: { durability }
             }, { new: true, upsert: true }).lean();
             teams.push(team);
         }
@@ -232,11 +232,11 @@ export default class GVGTeam extends BaseModel {
     public static async initCatapult(configId: number, groupKey: string, cityId: number, dicPoints: DicGVGAreaPoint[], leagueCode: string, leagueName: string, atk: number, durability: number, lv: number) {
         const teams: GVGTeamType[] = [];
         for(let { pointId, areaId, name, head, spine, ce } of dicPoints) {
-            let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ groupKey, cityId, areaId, pointId }, {
+            let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ configId, groupKey, cityId, areaId, pointId }, {
                 $setOnInsert: {
                     teamCode: genCode(8), maxDurability: durability, roleName: name, head, spine, frame: EXTERIOR.EXTERIOR_FACECASE, lineupCe: ce, lv, leagueCode, leagueName, captapultAtk: atk,
                     isRobot: true, isCatapult: true, isBroken: false, startMoveTime: 0, stopMoveTime: 0, guildCode: '', fromAreaId: areaId, roleId: GVG_CATAPULT,
-                }, $set: { configId, durability }
+                }, $set: { durability }
             }, { new: true, upsert: true }).lean();
             teams.push(team);
         }