diff --git a/src/components/Directory/EmployeeList.jsx b/src/components/Directory/EmployeeList.jsx
index f2d4f7c1..1374ba38 100644
--- a/src/components/Directory/EmployeeList.jsx
+++ b/src/components/Directory/EmployeeList.jsx
@@ -126,8 +126,8 @@ const EmployeeList = ({ employees, onChange, bucket }) => {
                         className="form-check-input me-3 mt-1"
                         type="checkbox"
                         checked={isChecked(employee.id)}
-                        onChange={() => handleCheckboxChange(employee.id)}
-                        disabled={bucket.createdBy.id === employee.id}
+                        onChange={() => handleCheckboxChange(employee?.id)}
+                        disabled={bucket?.createdBy?.id === employee?.id}
                       />
 
                       <Avatar