diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 39159645e..b996a2307 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -187,7 +187,8 @@ export class ComBattleHandler {
             for(let robotIdx = 0; robotIdx < robotCnt; robotIdx++) {
                 const joinTime = getRandValueByMinMax(COM_BTL_CONST.MIN_CAP_TIME, COM_BTL_CONST.MAX_CAP_TIME, 0);
                 setTimeout(async () => {
-                    if (teamStatus.status === COM_TEAM_STATUS.DEFAULT && teamStatus.roleIds.length < 3) {
+                    teamStatus = thiz.teamMap.get(teamCode);
+                    if (teamStatus && teamStatus.status === COM_TEAM_STATUS.DEFAULT && teamStatus.roleIds.length < 3) {
                         let { robotStArr, robotIdArr } = getRandComBtlRobots(topFiveCe, teamStatus.ceLimit, lv, 1);
                         teamStatus.roleIds = teamStatus.roleIds.concat(robotIdArr);
                         teamStatus.roleStatus = teamStatus.roleStatus.concat(robotStArr);
diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts
index 5bce01f10..16cd24ac2 100644
--- a/game-server/app/services/comBattleService.ts
+++ b/game-server/app/services/comBattleService.ts
@@ -357,6 +357,7 @@ export async function dismissTeam(teamStatus, teamMap: Map<string, any>, roleId:
 
 export function setDismissTimer(teamStatus, teamMap: Map<string, any>, roleId: string, teamDisTimer: Map<string, NodeJS.Timer>, app) {
     if (teamStatus && teamStatus.roleIds && teamStatus.roleIds.length === 3 && teamStatus.status === COM_TEAM_STATUS.DEFAULT) {
+        clearComBtlTimer(teamStatus.teamCode, teamDisTimer);
         let timer = setTimeout(async () => {
             await dismissTeam(teamStatus, teamMap, roleId, teamDisTimer, app);
         }, COM_BTL_CONST.CAP_START_TIME);