diff --git a/game-server/app/servers/role/handler/teamHandler.ts b/game-server/app/servers/role/handler/teamHandler.ts
index 98fbc5600..3471b3034 100644
--- a/game-server/app/servers/role/handler/teamHandler.ts
+++ b/game-server/app/servers/role/handler/teamHandler.ts
@@ -7,6 +7,7 @@ import { PvpSaveDataModel } from "../../../db/PvpSaveData";
 import { LadderMatchModel } from "../../../db/LadderMatch";
 import { GVGVestigeRankModel } from "../../../db/GVGVestigeRank";
 import { GVGTeamModel } from "../../../db/GVGTeam";
+import { PvpDefenseModel } from "../../../db/PvpDefense";
 
 
 
@@ -38,6 +39,12 @@ export class TeamHandler {
                     for(let { actorId } of defenseHeroes) heroes.push(actorId);
                 }
             }
+            let pvpDefense = await PvpDefenseModel.findByRoleId(roleId);
+            if(pvpDefense && pvpDefense.attack) {
+                let attackHeroes = pvpDefense.attack.heroes||[];
+                for(let { actorId } of attackHeroes) heroes.push(actorId);
+            }
+
             teams.push({ type: TEAM_TYPE.PVP, heroes });
         }