diff --git a/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReference.tsx b/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReference.tsx
index 46f3cd7faa76..0f7baf744cba 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReference.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReference.tsx
@@ -49,9 +49,9 @@ ExternalReferenceComponentProps
       <ExternalReferenceHeader
         externalReference={externalReference}
         PopoverComponent={
-          <ExternalReferencePopover id={''} handleRemove={undefined} />
+          <ExternalReferencePopover id={externalReference.id} handleRemove={undefined} />
         }
-        EditComponent={(
+        EditComponent={isFABReplaced && (
           <Security needs={[KNOWLEDGE_KNUPDATE]}>
             <ExternalReferenceEdition externalReferenceId={externalReference.id} />
           </Security>
@@ -62,42 +62,41 @@ ExternalReferenceComponentProps
         spacing={3}
         classes={{ container: classes.gridContainer }}
       >
-        {
-          overviewLayoutCustomization.map(({ key, width }) => {
-            switch (key) {
-              case 'basicInformation':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceOverview externalReference={externalReference} />
-                  </Grid>
-                );
-              case 'details':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceDetails externalReference={externalReference} />
-                  </Grid>
-                );
-              case 'linkedObjects':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceStixCoreObjects
-                      externalReference={externalReference}
-                    />
-                  </Grid>
-                );
-              case 'uploadedFiles':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceFileImportViewer
-                      externalReference={externalReference}
-                      connectorsImport={connectorsImport}
-                    />
-                  </Grid>
-                );
-              default:
-                return null;
-            }
-          })
+        {overviewLayoutCustomization.map(({ key, width }) => {
+          switch (key) {
+            case 'basicInformation':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceOverview externalReference={externalReference} />
+                </Grid>
+              );
+            case 'details':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceDetails externalReference={externalReference} />
+                </Grid>
+              );
+            case 'linkedObjects':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceStixCoreObjects
+                    externalReference={externalReference}
+                  />
+                </Grid>
+              );
+            case 'uploadedFiles':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceFileImportViewer
+                    externalReference={externalReference}
+                    connectorsImport={connectorsImport}
+                  />
+                </Grid>
+              );
+            default:
+              return null;
+          }
+        })
         }
       </Grid>
       {!isFABReplaced && (
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReferenceHeader.tsx b/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReferenceHeader.tsx
index 17b800928330..d1c294a18ce0 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReferenceHeader.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/external_references/ExternalReferenceHeader.tsx
@@ -22,7 +22,7 @@ const useStyles = makeStyles(() => ({
 interface ExternalReferenceHeaderComponentProps {
   externalReference: ExternalReferenceHeader_externalReference$data;
   PopoverComponent: ReactElement<{ id: string }>;
-  EditComponent?: React.JSX.Element;
+  EditComponent?: React.JSX.Element | boolean;
 }
 
 const ExternalReferenceHeaderComponent: FunctionComponent<ExternalReferenceHeaderComponentProps> = ({ externalReference, PopoverComponent, EditComponent }) => {
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Grouping.jsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Grouping.jsx
index dc864265a029..7e3e10ea8915 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Grouping.jsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Grouping.jsx
@@ -141,6 +141,7 @@ export default createFragmentContainer(GroupingComponent, {
         }
       }
       workflowEnabled
+      currentUserAccessRight
       ...GroupingDetails_grouping
       ...ContainerHeader_container
     }
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingEditionContainer.jsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingEditionContainer.jsx
index 193dd5ee8b0e..403f83b7eac1 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingEditionContainer.jsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/GroupingEditionContainer.jsx
@@ -13,7 +13,6 @@ const GroupingEditionContainer = (props) => {
 
   const { handleClose, grouping, open, controlledDial } = props;
   const { editContext } = grouping;
-
   return (
     <Drawer
       title={t_i18n('Update a grouping')}
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx
index a36a68b6cb90..188c149a06b5 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx
@@ -30,6 +30,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import GroupingEdition from './GroupingEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootGroupingSubscription($id: ID!) {
@@ -89,6 +90,8 @@ const RootGrouping = () => {
     [groupingId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Grouping') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -115,8 +118,10 @@ const RootGrouping = () => {
                   />
                   <ContainerHeader
                     container={grouping}
-                    PopoverComponent={<GroupingPopover />}
-                    EditComponent={(
+                    PopoverComponent={
+                      <GroupingPopover id={groupingId} />
+                    }
+                    EditComponent={isFABReplaced && (
                       <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
                         <GroupingEdition groupingId={grouping.id} />
                       </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx b/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx
index 4f2ab7f232a6..220e263e64d5 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx
@@ -29,6 +29,7 @@ import Breadcrumbs from '../../../../components/Breadcrumbs';
 import { getMainRepresentative } from '../../../../utils/defaultRepresentatives';
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import MalwareAnalysisEdition from './MalwareAnalysisEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootMalwareAnalysisSubscription($id: ID!) {
@@ -79,6 +80,8 @@ const RootMalwareAnalysis = () => {
     [malwareAnalysisId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
   const link = `/dashboard/analyses/malware_analyses/${malwareAnalysisId}/knowledge`;
@@ -106,7 +109,7 @@ const RootMalwareAnalysis = () => {
                     PopoverComponent={
                       <MalwareAnalysisPopover id={malwareAnalysisId} />
                     }
-                    EditComponent={(
+                    EditComponent={isFABReplaced && (
                       <Security needs={[KNOWLEDGE_KNUPDATE]}>
                         <MalwareAnalysisEdition malwareAnalysisId={malwareAnalysis.id} />
                       </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.tsx b/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.tsx
index 8fed90c3f4dd..650ca42af6d4 100644
--- a/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.tsx
@@ -139,10 +139,10 @@ const RootVulnerability = ({ queryRef, vulnerabilityId }: RootVulnerabilityProps
             <StixDomainObjectHeader
               entityType="Vulnerability"
               stixDomainObject={vulnerability}
-              PopoverComponent={<VulnerabilityPopover />}
+              PopoverComponent={<VulnerabilityPopover id={vulnerabilityId} />}
               EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
-                  <VulnerabilityEdition vulnerabilityId={vulnerability.id} />
+                  <VulnerabilityEdition vulnerabilityId={vulnerabilityId} />
                 </Security>
               )}
               enableQuickSubscription={true}
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx
index 4fdd3d6bb9cb..16392bd14bc2 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx
@@ -32,6 +32,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CaseIncidentEdition from './CaseIncidentEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootIncidentCaseSubscription($id: ID!) {
@@ -89,6 +90,8 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Case-Incident') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -116,11 +119,11 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={caseData}
         PopoverComponent={<CaseIncidentPopover id={caseData.id} />}
-        EditComponent={
+        EditComponent={isFABReplaced && (
           <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
             <CaseIncidentEdition caseId={caseData.id} />
           </Security>
-        }
+        )}
         enableQuickSubscription={true}
         enableAskAi={true}
         redirectToContent={true}
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx
index f7ab2e5b04a0..9aa6c74a34ed 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx
@@ -31,6 +31,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CaseRfiEdition from './CaseRfiEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootCaseRfiCaseSubscription($id: ID!) {
@@ -86,6 +87,8 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Case-Rfi') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -111,9 +114,11 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={caseData}
         PopoverComponent={<CaseRfiPopover id={caseData.id} />}
-        EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
+        EditComponent={isFABReplaced && (
+        <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
           <CaseRfiEdition caseId={caseData.id} />
-        </Security>}
+        </Security>
+        )}
         enableQuickSubscription={true}
         enableAskAi={true}
         redirectToContent={true}
diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx
index c21f40c0982b..66e80e4e3572 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx
@@ -30,6 +30,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CaseRftEdition from './CaseRftEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootCaseRftCaseSubscription($id: ID!) {
@@ -85,6 +86,8 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Case-Rft') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -110,9 +113,11 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={caseData}
         PopoverComponent={<CaseRftPopover id={caseData.id} />}
-        EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
+        EditComponent={isFABReplaced && (
+        <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
           <CaseRftEdition caseId={caseData.id} />
-        </Security>}
+        </Security>
+        )}
         enableQuickSubscription={true}
         enableAskAi={true}
         redirectToContent={true}
diff --git a/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx
index a74a256d8acd..826bc37e470b 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx
@@ -30,6 +30,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE } from '../../../../ut
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import FeedbackEdition from './FeedbackEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootFeedbackSubscription($id: ID!) {
@@ -91,6 +92,8 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Feedback') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -116,9 +119,11 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={feedbackData}
         PopoverComponent={<FeedbackPopover id={feedbackData.id} />}
-        EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={canEdit}>
+        EditComponent={isFABReplaced && (
+        <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={canEdit}>
           <FeedbackEdition feedbackId={feedbackData.id} />
-        </Security>}
+        </Security>
+        )}
         enableSuggestions={false}
         disableSharing={true}
         enableQuickSubscription
diff --git a/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx
index 5262c0eeddb1..0e1d918ab4ee 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx
@@ -28,6 +28,7 @@ import { useIsEnforceReference } from '../../../../utils/hooks/useEntitySettings
 import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE } from '../../../../utils/hooks/useGranted';
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import TaskEdition from './TaskEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootTaskSubscription($id: ID!) {
@@ -75,6 +76,8 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
     [taskId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Task') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -97,9 +100,11 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
           <ContainerHeader
             container={data}
             PopoverComponent={<TasksPopover id={data.id} />}
-            EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]}>
-              <TaskEdition caseId={data.id} />
-            </Security>}
+            EditComponent={isFABReplaced && (
+              <Security needs={[KNOWLEDGE_KNUPDATE]}>
+                <TaskEdition caseId={data.id} />
+              </Security>
+            )}
             enableSuggestions={false}
             redirectToContent={true}
             disableAuthorizedMembers={true}
diff --git a/opencti-platform/opencti-front/src/private/components/entities/events/Root.tsx b/opencti-platform/opencti-front/src/private/components/entities/events/Root.tsx
index 81df7484e08c..4495ad43524f 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/events/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/events/Root.tsx
@@ -27,6 +27,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import EventEdition from './EventEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootEventsSubscription($id: ID!) {
@@ -83,6 +84,8 @@ const RootEvent = ({ eventId, queryRef }: RootEventProps) => {
   }), [eventId]);
 
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription<RootEventsSubscription>(subConfig);
 
@@ -135,7 +138,7 @@ const RootEvent = ({ eventId, queryRef }: RootEventProps) => {
               stixDomainObject={event}
               enableQuickSubscription={true}
               PopoverComponent={<EventPopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <EventEdition eventId={event.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.tsx b/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.tsx
index a61bf75a5e5b..f956af9fb86f 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.tsx
@@ -29,6 +29,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import IndividualEdition from './IndividualEdition';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootIndividualsSubscription($id: ID!) {
@@ -87,6 +88,9 @@ const RootIndividual = ({ individualId, queryRef }: RootIndividualProps) => {
     variables: { id: individualId },
   }), [individualId]);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
+
   const navigate = useNavigate();
   const LOCAL_STORAGE_KEY = `individual-${individualId}`;
   const params = buildViewParamsFromUrlAndStorage(
@@ -169,7 +173,7 @@ const RootIndividual = ({ individualId, queryRef }: RootIndividualProps) => {
               isOpenctiAlias={true}
               enableQuickSubscription={true}
               PopoverComponent={<IndividualPopover />}
-              EditComponent={!individual.isUser && (
+              EditComponent={!individual.isUser && isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <IndividualEdition individualId={individual.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.tsx b/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.tsx
index 7322a215ea85..83a14e27dac7 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/organizations/Root.tsx
@@ -29,6 +29,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import OrganizationEdition from './OrganizationEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootOrganizationSubscription($id: ID!) {
@@ -86,6 +87,8 @@ const RootOrganization = ({ organizationId, queryRef }: RootOrganizationProps) =
     variables: { id: organizationId },
   }), [organizationId]);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const navigate = useNavigate();
   const LOCAL_STORAGE_KEY = `organization-${organizationId}`;
   const params = buildViewParamsFromUrlAndStorage(
@@ -169,7 +172,7 @@ const RootOrganization = ({ organizationId, queryRef }: RootOrganizationProps) =
               isOpenctiAlias={true}
               enableQuickSubscription={true}
               PopoverComponent={<OrganizationPopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <OrganizationEdition organizationId={organization.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.tsx b/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.tsx
index a968a13aed2f..156d2d11d5e5 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/sectors/Root.tsx
@@ -27,6 +27,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import SectorEdition from './SectorEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootSectorSubscription($id: ID!) {
@@ -85,6 +86,8 @@ const RootSector = ({ sectorId, queryRef }: RootSectorProps) => {
   }), [sectorId]);
 
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription<RootSectorSubscription>(subConfig);
 
@@ -139,7 +142,7 @@ const RootSector = ({ sectorId, queryRef }: RootSectorProps) => {
               isOpenctiAlias={true}
               enableQuickSubscription={true}
               PopoverComponent={<SectorPopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <SectorEdition sectorId={sector.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/entities/systems/Root.tsx b/opencti-platform/opencti-front/src/private/components/entities/systems/Root.tsx
index 1bcd1c95d53f..2e3e804b19c3 100644
--- a/opencti-platform/opencti-front/src/private/components/entities/systems/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/entities/systems/Root.tsx
@@ -29,6 +29,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import SystemEdition from './SystemEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootSystemsSubscription($id: ID!) {
@@ -84,6 +85,8 @@ const RootSystem = ({ systemId, queryRef }: RootSystemProps) => {
     variables: { id: systemId },
   }), [systemId]);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const navigate = useNavigate();
   const LOCAL_STORAGE_KEY = `system-${systemId}`;
   const params = buildViewParamsFromUrlAndStorage(
@@ -162,7 +165,7 @@ const RootSystem = ({ systemId, queryRef }: RootSystemProps) => {
               isOpenctiAlias={true}
               enableQuickSubscription={true}
               PopoverComponent={<SystemPopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <SystemEdition systemId={system.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx b/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx
index a0e73c8ecdb8..8da81f0b2eeb 100644
--- a/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/events/incidents/Root.tsx
@@ -30,6 +30,7 @@ import { useFormatter } from '../../../../components/i18n';
 import Breadcrumbs from '../../../../components/Breadcrumbs';
 import { getCurrentTab } from '../../../../utils/utils';
 import IncidentEdition from './IncidentEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootIncidentSubscription($id: ID!) {
@@ -86,6 +87,8 @@ const RootIncidentComponent = ({ queryRef }) => {
     [incidentId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
   const data = usePreloadedQuery(incidentQuery, queryRef);
@@ -138,7 +141,7 @@ const RootIncidentComponent = ({ queryRef }) => {
               entityType="Incident"
               stixDomainObject={incident}
               PopoverComponent={IncidentPopover}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <IncidentEdition incidentId={incident.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx
index bb99af71b3d8..2f6ed2b1a86c 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/administrative_areas/Root.tsx
@@ -30,6 +30,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import AdministrativeAreaEdition from './AdministrativeAreaEdition';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootAdministrativeAreasSubscription($id: ID!) {
@@ -86,6 +87,8 @@ const RootAdministrativeAreaComponent = ({ queryRef, administrativeAreaId }) =>
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(administrativeAreaQuery, queryRef);
   const { forceUpdate } = useForceUpdate();
@@ -136,7 +139,7 @@ const RootAdministrativeAreaComponent = ({ queryRef, administrativeAreaId }) =>
               PopoverComponent={
                 <AdministrativeAreaPopover id={administrativeArea.id} />
             }
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <AdministrativeAreaEdition
                     administrativeAreaId={administrativeArea.id}
diff --git a/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx
index 175fe0e255ac..97ae95e8f2a6 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/cities/Root.tsx
@@ -30,6 +30,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CityEdition from './CityEdition';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootCitiesSubscription($id: ID!) {
@@ -84,6 +85,8 @@ const RootCityComponent = ({ queryRef, cityId }) => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(cityQuery, queryRef);
   const { forceUpdate } = useForceUpdate();
@@ -132,7 +135,7 @@ const RootCityComponent = ({ queryRef, cityId }) => {
               disableSharing={true}
               stixDomainObject={city}
               PopoverComponent={<CityPopover id={city.id} />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <CityEdition cityId={city.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx
index 507421334f4b..ce6bb6929486 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/countries/Root.tsx
@@ -30,6 +30,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CountryEdition from './CountryEdition';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootCountriesSubscription($id: ID!) {
@@ -86,6 +87,8 @@ const RootCountryComponent = ({ queryRef, countryId }) => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(countryQuery, queryRef);
   const { forceUpdate } = useForceUpdate();
@@ -134,7 +137,7 @@ const RootCountryComponent = ({ queryRef, countryId }) => {
               disableSharing={true}
               stixDomainObject={country}
               PopoverComponent={<CountryPopover id={country.id} />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <CountryEdition countryId={country.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/locations/positions/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/positions/Root.tsx
index 999208b9ae86..038787a0780b 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/positions/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/positions/Root.tsx
@@ -27,6 +27,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import PositionEdition from './PositionEdition';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootPositionsSubscription($id: ID!) {
@@ -83,6 +84,8 @@ const RootPosition = ({ positionId, queryRef }: RootPositionProps) => {
   }), [positionId]);
 
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription<RootPositionsSubscription>(subConfig);
 
@@ -139,7 +142,7 @@ const RootPosition = ({ positionId, queryRef }: RootPositionProps) => {
               disableSharing={true}
               stixDomainObject={position}
               PopoverComponent={<PositionPopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <PositionEdition positionId={position.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx b/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx
index b753a9382dec..7fa199f54944 100644
--- a/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/locations/regions/Root.tsx
@@ -31,6 +31,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import RegionEdition from './RegionEdition';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootRegionsSubscription($id: ID!) {
@@ -87,6 +88,8 @@ const RootRegionComponent = ({ queryRef, regionId }) => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(regionQuery, queryRef);
   const { forceUpdate } = useForceUpdate();
@@ -136,7 +139,7 @@ const RootRegionComponent = ({ queryRef, regionId }) => {
               disableSharing={true}
               stixDomainObject={region}
               PopoverComponent={<RegionPopover id={region.id} />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <RegionEdition regionId={region.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.tsx b/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.tsx
index 64579d8b6eb1..49bbdca8fcda 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/indicators/Root.tsx
@@ -28,6 +28,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import IndicatorEdition from './IndicatorEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootIndicatorSubscription($id: ID!) {
@@ -81,6 +82,8 @@ const RootIndicator = ({ indicatorId, queryRef }: RootIndicatorProps) => {
   }), [indicatorId]);
 
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription<RootIndicatorSubscription>(subConfig);
 
@@ -107,11 +110,11 @@ const RootIndicator = ({ indicatorId, queryRef }: RootIndicatorProps) => {
             entityType="Indicator"
             stixDomainObject={indicator}
             PopoverComponent={<IndicatorPopover/>}
-            EditComponent={
+            EditComponent={isFABReplaced && (
               <Security needs={[KNOWLEDGE_KNUPDATE]}>
                 <IndicatorEdition indicatorId={indicator.id} />
               </Security>
-            }
+            )}
             noAliases={true}
           />
           <Box
diff --git a/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx b/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx
index 68910f382638..0fb1a6e364c2 100644
--- a/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/observations/infrastructures/Root.tsx
@@ -29,6 +29,7 @@ import { getCurrentTab } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import InfrastructureEdition from './InfrastructureEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootInfrastructureSubscription($id: ID!) {
@@ -79,6 +80,8 @@ const RootInfrastructureComponent = ({ queryRef, infrastructureId }) => {
     [infrastructureId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
   const data = usePreloadedQuery(infrastructureQuery, queryRef);
@@ -106,11 +109,11 @@ const RootInfrastructureComponent = ({ queryRef, infrastructureId }) => {
             entityType="Infrastructure"
             stixDomainObject={infrastructure}
             PopoverComponent={InfrastructurePopover}
-            EditComponent={
+            EditComponent={isFABReplaced && (
               <Security needs={[KNOWLEDGE_KNUPDATE]}>
                 <InfrastructureEdition infrastructureId={infrastructure.id} />
               </Security>
-            }
+            )}
             enableQuickSubscription={true}
           />
           <Box
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.tsx b/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.tsx
index 0227acaa5241..a6427bb00981 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/Root.tsx
@@ -26,6 +26,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import AttackPatternEdition from './AttackPatternEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootAttackPatternSubscription($id: ID!) {
@@ -83,6 +84,8 @@ const RootAttackPattern = ({ attackPatternId, queryRef }: RootAttackPatternProps
   }), [attackPatternId]);
 
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription<RootAttackPatternSubscription>(subConfig);
 
@@ -135,7 +138,7 @@ const RootAttackPattern = ({ attackPatternId, queryRef }: RootAttackPatternProps
               entityType="Attack-Pattern"
               stixDomainObject={attackPattern}
               PopoverComponent={<AttackPatternPopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <AttackPatternEdition attackPatternId={attackPattern.id} />
                 </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx b/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx
index 3120d63cdd15..31fd7a295bbd 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/data_components/Root.tsx
@@ -27,6 +27,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import DataComponentEdition from './DataComponentEdition';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootDataComponentSubscription($id: ID!) {
@@ -81,6 +82,8 @@ const RootDataComponent = () => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   return (
     <>
@@ -106,7 +109,7 @@ const RootDataComponent = () => {
                     PopoverComponent={
                       <DataComponentPopover dataComponentId={dataComponentId}/>
                     }
-                    EditComponent={(
+                    EditComponent={isFABReplaced && (
                       <Security needs={[KNOWLEDGE_KNUPDATE]}>
                         <DataComponentEdition dataComponentId={dataComponent.id} />
                       </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx b/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx
index a177f5b4a60a..b73fa1db5d22 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/data_sources/Root.tsx
@@ -27,6 +27,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import DataSourceEdition from './DataSourceEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootDataSourcesSubscription($id: ID!) {
@@ -79,6 +80,8 @@ const RootDataSourceComponent = ({ queryRef, dataSourceId }) => {
   );
   useSubscription(subConfig);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   const data = usePreloadedQuery(dataSourceQuery, queryRef);
   const { dataSource, connectorsForImport, connectorsForExport, settings } = data;
@@ -98,7 +101,7 @@ const RootDataSourceComponent = ({ queryRef, dataSourceId }) => {
             noAliases={true}
             stixDomainObject={dataSource}
             PopoverComponent={<DataSourcePopover id={dataSource.id}/>}
-            EditComponent={(
+            EditComponent={isFABReplaced && (
               <Security needs={[KNOWLEDGE_KNUPDATE]}>
                 <DataSourceEdition dataSourceId={dataSource.id} />
               </Security>
diff --git a/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.tsx b/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.tsx
index 9838d6a76208..c53f13a841c7 100644
--- a/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.tsx
+++ b/opencti-platform/opencti-front/src/private/components/techniques/narratives/Root.tsx
@@ -26,6 +26,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import NarrativeEdition from './NarrativeEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootNarrativeSubscription($id: ID!) {
@@ -83,6 +84,8 @@ const RootNarrative = ({ narrativeId, queryRef }: RootNarrativeProps) => {
   }), [narrativeId]);
 
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription<RootNarrativeSubscription>(subConfig);
 
@@ -131,7 +134,7 @@ const RootNarrative = ({ narrativeId, queryRef }: RootNarrativeProps) => {
               entityType="Narrative"
               stixDomainObject={narrative}
               PopoverComponent={<NarrativePopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <NarrativeEdition narrativeId={narrative.id} />
                 </Security>