diff --git a/src/orchestrator/Orchestrator.tsx b/src/orchestrator/Orchestrator.tsx
index 4e93631c..d00ef8a2 100644
--- a/src/orchestrator/Orchestrator.tsx
+++ b/src/orchestrator/Orchestrator.tsx
@@ -310,8 +310,16 @@ const getVariables = (
 };
 
 export const OrchestratorForStories = (props: OrchestratorProps) => {
-    let { source, data, callbackHolder, page, subPage, iteration, componentSpecificProps, overrideOptions } =
-        props;
+    let {
+        source,
+        data,
+        callbackHolder,
+        page,
+        subPage,
+        iteration,
+        componentSpecificProps,
+        overrideOptions,
+    } = props;
     const { classes, cx } = useStyles();
     const { getComponents, getCurrentErrors, getData } = (lunatic as any).useLunatic(source, data, {
         initialPage:
@@ -325,10 +333,14 @@ export const OrchestratorForStories = (props: OrchestratorProps) => {
     const currentErrors = getCurrentErrors();
 
     const getDataLocal = () => {
+        // Since we want to disable EDITED, only consider collected data
+        return getDataInterviewer(getData, data, source);
+        /*
         const dataLocal = isReviewer()
             ? getDataReviewer(getData, data, components, iteration)
             : getDataInterviewer(getData, data, source);
         return dataLocal;
+         */
     };
 
     callbackHolder.getData = getDataLocal;
diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
index f7bcef19..ecec39c5 100644
--- a/src/service/survey-service.ts
+++ b/src/service/survey-service.ts
@@ -398,7 +398,7 @@ const initializeHomeSurveys = (idHousehold: string) => {
         addArrayToSession("userDatas", userDatas);
         initializeRefs().then(() => {
             resolve(true);
-        })
+        });
     });
 };
 
@@ -1622,11 +1622,15 @@ const existVariableEdited = (idSurvey?: string, data?: LunaticData) => {
 };
 
 const getModePersistence = (data: LunaticData | undefined): ModePersistenceEnum => {
+    // We don't want to use EDITED anymore, to minimize changes we will simulate COLLECTED for everything
+    return ModePersistenceEnum.COLLECTED;
+    /*
     const isReviewerMode = isReviewer();
     const isLocked = data?.COLLECTED?.[FieldNameEnum.ISLOCKED]?.COLLECTED as boolean;
     return isReviewerMode || isLocked || existVariableEdited(undefined, data)
         ? ModePersistenceEnum.EDITED
         : ModePersistenceEnum.COLLECTED;
+     */
 };
 
 const getValueWithData = (