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 e5461d0..c962145 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
@@ -143,7 +143,11 @@ open class StaffsService(
                 name = req.name
                 phone1 = req.phone1
                 email = req.email ?: null
-                locked = LocalDate.now().isAfter(req.departDate)
+                locked = if (req.departDate != null) {
+                    LocalDate.now().isAfter(req.departDate)
+                } else {
+                    false
+                }
             }
         )