diff --git a/src/main/java/gg/agit/konect/domain/club/enums/RecruitmentStatus.java b/src/main/java/gg/agit/konect/domain/club/enums/RecruitmentStatus.java
index 4ff1b445..55810bb5 100644
--- a/src/main/java/gg/agit/konect/domain/club/enums/RecruitmentStatus.java
+++ b/src/main/java/gg/agit/konect/domain/club/enums/RecruitmentStatus.java
@@ -21,13 +21,24 @@ public static RecruitmentStatus of(ClubRecruitment clubRecruitment) {
             return CLOSED;
         }
 
+        if (Boolean.TRUE.equals(clubRecruitment.getIsAlwaysRecruiting())) {
+            return ONGOING;
+        }
+
+        LocalDate startDate = clubRecruitment.getStartDate();
+        LocalDate endDate = clubRecruitment.getEndDate();
+
+        if (startDate == null || endDate == null) {
+            return CLOSED;
+        }
+
         LocalDate now = LocalDate.now();
 
-        if (now.isBefore(clubRecruitment.getStartDate())) {
+        if (now.isBefore(startDate)) {
             return BEFORE;
         }
 
-        if (now.isAfter(clubRecruitment.getEndDate())) {
+        if (now.isAfter(endDate)) {
             return CLOSED;
         }