diff --git a/plugins/rbac/src/components/CreateRole/AddMembersForm.tsx b/plugins/rbac/src/components/CreateRole/AddMembersForm.tsx
index c5494e2182..afb96f1ccc 100644
--- a/plugins/rbac/src/components/CreateRole/AddMembersForm.tsx
+++ b/plugins/rbac/src/components/CreateRole/AddMembersForm.tsx
@@ -77,10 +77,12 @@ export const AddMembersForm = ({
       </FormHelperText>
       <br />
       <Autocomplete
-        options={membersOptions}
+        options={membersOptions || []}
         getOptionLabel={(option: SelectedMember) => option.label ?? ''}
         getOptionSelected={(option: SelectedMember, value: SelectedMember) =>
-          option.etag === value.etag
+          value.etag
+            ? option.etag === value.etag
+            : selectedMember.etag === value.etag
         }
         loading={membersData.loading}
         loadingText={<LinearProgress />}
diff --git a/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx b/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx
index a1c57a874a..0486665458 100644
--- a/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx
+++ b/plugins/rbac/src/components/CreateRole/PermissionPoliciesFormRow.tsx
@@ -93,7 +93,7 @@ export const PermissionPoliciesFormRow = ({
           <Autocomplete
             options={permissionPoliciesData?.plugins ?? []}
             style={{ width: '35%', flexGrow: '1' }}
-            value={permissionPoliciesRowData.plugin ?? ''}
+            value={permissionPoliciesRowData.plugin || null}
             onChange={(_e, value) => {
               onChangePlugin(value ?? '');
             }}
@@ -119,7 +119,7 @@ export const PermissionPoliciesFormRow = ({
               ]?.permissions ?? []
             }
             style={{ width: '35%', flexGrow: '1' }}
-            value={permissionPoliciesRowData.permission ?? ''}
+            value={permissionPoliciesRowData.permission || null}
             onChange={(_e, value) =>
               onChangePermission(
                 value ?? '',