diff --git a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
index d815198..7132867 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
@@ -377,9 +377,8 @@ open class StaffsService(
             val user = userRepository.findByUsernameAndDeletedFalse(staff.staffId).orElseThrow()
 
             user.apply {
-                locked = LocalDate.now().isAfter(staff.departDate)
+                locked = if (staff.departDate != null) { LocalDate.now().isAfter(staff.departDate) } else false
             }
-
             users += user
         }