diff --git a/src/GZCTF/Services/CronJobService.cs b/src/GZCTF/Services/CronJobService.cs
index 387a6fba1..aa03b5dcd 100644
--- a/src/GZCTF/Services/CronJobService.cs
+++ b/src/GZCTF/Services/CronJobService.cs
@@ -99,6 +99,9 @@ await gameNoticeRepository.AddNotice(
                 }
                 
                 if (!gameChallenge.IsEnabled)
+                    continue;
+
+                if (gameChallenge.EndAt <= DateTimeOffset.Now)
                 {
                     gameChallenge.CanSubmit = false;
                 }