diff --git a/YD_Event.Application/Event/EventService.cs b/YD_Event.Application/Event/EventService.cs
index fadef76..3acc6f4 100644
--- a/YD_Event.Application/Event/EventService.cs
+++ b/YD_Event.Application/Event/EventService.cs
@@ -88,6 +88,7 @@ public class EventService : BaseService<EventInfo>, ITransient
             .WhereIF(input.EventType.HasValue, x => x.EventType == input.EventType)
             .WhereIF(input.ChargeMode.HasValue, x => x.ChargeMode == input.ChargeMode)
             .WhereIF(input.EventStatus.HasValue, x => x.EventStatus == input.EventStatus)
+            .WhereIF(!input.EventStatus.HasValue, x => x.EventStatus != EventStatus.NotStarted && x.EventStatus != EventStatus.Ended)
             .WhereIF(input.RegistrationStartTime.HasValue, x => x.RegistrationStartTime >= input.RegistrationStartTime)
             .WhereIF(input.RegistrationEndTime.HasValue, x => x.RegistrationEndTime <= input.RegistrationEndTime)
             .WhereIF(input.MatchStartTime.HasValue, x => x.MatchStartTime >= input.MatchStartTime)