diff --git a/shared/db/GVGLeague.ts b/shared/db/GVGLeague.ts
index aef1807c4..96e97bb34 100644
--- a/shared/db/GVGLeague.ts
+++ b/shared/db/GVGLeague.ts
@@ -89,10 +89,12 @@ export default class GVGLeague extends BaseModel {
 
     public static async findByCondition(type: number, serverIds: number[], page: number, name: string) {
         let query = {
-            status: 1, type, serverId: { $in: serverIds }, guildCnt: { $lt: GVG.GVG_LEAGUE_COMPOSE }
+            status: 1, type, serverId: { $in: serverIds }
         };
         if(name) {
             query['name'] = { $regex: new RegExp(name, 'i') };
+        } else {
+            query['guildCnt'] = { $lt: GVG.GVG_LEAGUE_COMPOSE };
         }
         const league: GVGLeagueType[] = await GVGLeagueModel.find(query)
         .populate('leader', { roleId: 1, roleName: 1, head: 1, frame: 1, spine: 1, lv: 1, quitTime: 1, ce: 1, title: 1, serverId: 1, _id: 0 }, 'Role')