diff --git a/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx b/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx
index 39baf857fd..40e52e0e0a 100644
--- a/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx
+++ b/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx
@@ -76,7 +76,11 @@ export const AddNewOrgAdminsForm = () => {
                 required
                 value={value}
                 onChange={(e) => {
-                  const emails = e.target.value.split(",").map((email) => email.trim().toLocaleLowerCase());
+                  const targetValues = e.target.value.split(",");
+                  const emails =
+                    targetValues.length === 1
+                      ? targetValues[0].trim().toLocaleLowerCase()
+                      : targetValues.map((email) => email.trim().toLocaleLowerCase());
 
                   return onChange(emails);
                 }}
diff --git a/packages/features/ee/teams/components/MemberInvitationModal.tsx b/packages/features/ee/teams/components/MemberInvitationModal.tsx
index 03a48921af..dd388009e2 100644
--- a/packages/features/ee/teams/components/MemberInvitationModal.tsx
+++ b/packages/features/ee/teams/components/MemberInvitationModal.tsx
@@ -236,9 +236,11 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
                         required
                         value={value}
                         onChange={(e) => {
-                          const emails = e.target.value
-                            .split(",")
-                            .map((email) => email.trim().toLocaleLowerCase());
+                          const targetValues = e.target.value.split(",");
+                          const emails =
+                            targetValues.length === 1
+                              ? targetValues[0].trim().toLocaleLowerCase()
+                              : targetValues.map((email) => email.trim().toLocaleLowerCase());
 
                           return onChange(emails);
                         }}