diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts
index 686cbcbe5..b5119ec7a 100644
--- a/game-server/app/services/pvpService.ts
+++ b/game-server/app/services/pvpService.ts
@@ -145,7 +145,9 @@ export async function matchPlayerByRank(oppPlayers: OppPlayers[], mapWarJson: Di
     oppRoleId = result[0];
 
     let pvpdefense = await PvpDefenseModel.findByRoleIdIncludeAll(oppRoleId);
+    if(!pvpdefense) return false;
     let pvpHistoryOpp = await generPlayerOppHis(pvpdefense, mapWarJson, roleId, pos);
+    if(!pvpHistoryOpp) return false;
 
     oppPlayers.push({
         roleId: pvpHistoryOpp.oppRoleId,
@@ -176,6 +178,7 @@ async function matchPlayer(oppPlayers: OppPlayers[], mapWarJson: DicWarJson[], r
         result = range[index];
     }
     let pvpHistoryOpp = await generPlayerOppHis(result, mapWarJson, roleId, pos);
+    if(!pvpHistoryOpp) return false;
     oppPlayers.push({
         roleId: pvpHistoryOpp.oppRoleId,
         oppDef: pvpHistoryOpp._id,