diff --git a/opencti-platform/opencti-front/src/private/components/common/form/AuthorizedMembersField.tsx b/opencti-platform/opencti-front/src/private/components/common/form/AuthorizedMembersField.tsx
index 9d0f912b04ff1..ae67988bd4f70 100644
--- a/opencti-platform/opencti-front/src/private/components/common/form/AuthorizedMembersField.tsx
+++ b/opencti-platform/opencti-front/src/private/components/common/form/AuthorizedMembersField.tsx
@@ -17,7 +17,6 @@ import SelectField from '../../../../components/fields/SelectField';
 import { useFormatter } from '../../../../components/i18n';
 import { AccessRight, ALL_MEMBERS_AUTHORIZED_CONFIG, AuthorizedMemberOption, Creator, CREATOR_AUTHORIZED_CONFIG } from '../../../../utils/authorizedMembers';
 import SwitchField from '../../../../components/fields/SwitchField';
-import useAuth from '../../../../utils/hooks/useAuth';
 
 /**
  * Returns true if the authorized member option is generic.
@@ -75,7 +74,6 @@ const AuthorizedMembersField = ({
   canDeactivate = false,
 }: AuthorizedMembersFieldProps) => {
   const { t_i18n } = useFormatter();
-  const { me } = useAuth();
   const { setFieldValue } = form;
   const { name, value } = field;
 
@@ -177,14 +175,6 @@ const AuthorizedMembersField = ({
           accessRight: 'admin',
         });
       }
-      if (me.id !== owner?.id) {
-        values.push({
-          label: me.name,
-          type: 'User',
-          value: me.id,
-          accessRight: 'admin',
-        });
-      }
       setFieldValue(name, values);
     }
   };
diff --git a/opencti-platform/opencti-front/src/private/components/settings/sub_types/entity_setting/EntitySettingAttributeEdition.tsx b/opencti-platform/opencti-front/src/private/components/settings/sub_types/entity_setting/EntitySettingAttributeEdition.tsx
index 5fe68c13ff25e..1822961a370d9 100644
--- a/opencti-platform/opencti-front/src/private/components/settings/sub_types/entity_setting/EntitySettingAttributeEdition.tsx
+++ b/opencti-platform/opencti-front/src/private/components/settings/sub_types/entity_setting/EntitySettingAttributeEdition.tsx
@@ -121,14 +121,14 @@ const EntitySettingAttributeEdition = ({
         // due to the fact that this component managed all types of fields and this
         // query is used only for one particular case.
         const data = (await fetchQuery(entitySettingAttributeEditionMembersQuery, {
-          filters: {
+          filters: defaultAuthorizedMembers.length > 0 ? {
             mode: 'and',
             filters: [{
               key: 'ids',
               values: defaultAuthorizedMembers.map((m) => m.id),
             }],
             filterGroups: [],
-          },
+          } : undefined,
         }).toPromise()) as EntitySettingAttributeEditionMembersQuery$data;
         setMembersData(data);
       };