diff --git a/frontend/src/hooks/api/machineIdentities/types.ts b/frontend/src/hooks/api/machineIdentities/types.ts
index cd0c6faf6..64a610380 100644
--- a/frontend/src/hooks/api/machineIdentities/types.ts
+++ b/frontend/src/hooks/api/machineIdentities/types.ts
@@ -29,7 +29,7 @@ export type MachineMembershipOrg = {
     machineIdentity: MachineIdentity;
     organization: string;
     role: "admin" | "member" | "viewer" | "custom";
-    customRole?: TRole;
+    customRole?: TRole<string>;
     createdAt: string;
     updatedAt: string;
 }
@@ -39,7 +39,7 @@ export type MachineMembership = {
     machineIdentity: MachineIdentity;
     organization: string;
     role: "admin" | "member" | "viewer" | "custom";
-    customRole?: TRole;
+    customRole?: TRole<string>;
     createdAt: string;
     updatedAt: string;
 }
diff --git a/frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
index 642e82837..dcf255695 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
@@ -181,7 +181,7 @@ export const MachineIdentityTable = ({
                                             return (
                                                 <Select
                                                     value={
-                                                        role === "custom" ? customRole.slug : role
+                                                        role === "custom" ? (customRole?.slug as string) : role
                                                     }
                                                     isDisabled={!isAllowed}
                                                     className="w-40 bg-mineshaft-600"
diff --git a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
index 40080fd3f..3465dd0c0 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
@@ -103,7 +103,7 @@ export const AddOrgMemberModal = ({
             isOpen={popUp?.addMember?.isOpen}
             onOpenChange={(isOpen) => {
                 handlePopUpToggle("addMember", isOpen);
-                setCompleteInviteLink(undefined);
+                setCompleteInviteLink("");
             }}
         >
         <ModalContent
diff --git a/frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx b/frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
index 6edc9f097..0bddc7f21 100644
--- a/frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
+++ b/frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
@@ -133,7 +133,7 @@ export const MachineIdentityTable = ({
                                             return (
                                                 <Select
                                                     value={
-                                                        role === "custom" ? customRole.slug : role
+                                                        role === "custom" ? (customRole?.slug as string) : role
                                                     }
                                                     isDisabled={!isAllowed}
                                                     className="w-40 bg-mineshaft-600"