diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index 84a02cda4..aa44258f9 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -111,8 +111,8 @@ export class ComBattleHandler {
         let roleStatus = new RoleStatus();
         roleStatus.heroes = [];
         roleStatus.isCap = false;
-        roleStatus.headHid = headHid;
-        roleStatus.topFiveCe = topFiveCe;
+        roleStatus.headHid = headHid || roleStatus.headHid;
+        roleStatus.topFiveCe = topFiveCe || roleStatus.topFiveCe;
         roleStatus.roleId = roleId;
         roleStatus.isFrd = isFrd;
         const team = await ComBattleTeamModel.addRole(teamCode, roleStatus);