diff --git a/packages/app/src/app/(default)/index-egapro/declaration/[siren]/[year]/RecapCardIndicator.tsx b/packages/app/src/app/(default)/index-egapro/declaration/[siren]/[year]/RecapCardIndicator.tsx
index bdd850c397..c4d45e0f99 100644
--- a/packages/app/src/app/(default)/index-egapro/declaration/[siren]/[year]/RecapCardIndicator.tsx
+++ b/packages/app/src/app/(default)/index-egapro/declaration/[siren]/[year]/RecapCardIndicator.tsx
@@ -51,7 +51,7 @@ export const RecapCardIndicator = ({ name, customContent, edit, déclaration }:
             </p>
           )}
 
-          {note !== undefined && (
+          {note !== undefined && !motifNc && (
             <IndicatorNote
               note={note}
               max={indicatorNoteMax[name]}
diff --git a/packages/app/src/app/(default)/index-egapro/declaration/remunerations/RemunerationForm.tsx b/packages/app/src/app/(default)/index-egapro/declaration/remunerations/RemunerationForm.tsx
index 6880c5cce5..4715d52411 100644
--- a/packages/app/src/app/(default)/index-egapro/declaration/remunerations/RemunerationForm.tsx
+++ b/packages/app/src/app/(default)/index-egapro/declaration/remunerations/RemunerationForm.tsx
@@ -102,7 +102,7 @@ const stepName: FunnelKey = "remunerations";
 
 export const RemunerationForm = () => {
   const router = useRouter();
-  const { formData, saveFormData } = useDeclarationFormManager();
+  const { formData, saveFormData, savePageData } = useDeclarationFormManager();
 
   assertOrRedirectCommencerStep(formData);
 
@@ -153,14 +153,17 @@ export const RemunerationForm = () => {
         });
       }
 
-      // Prevent stale data mixing with new data
+      //FIXME: changing estCalculable to non on modified déclaration desyncs remunerations-resultat
+      if (data.estCalculable === "non") {
+        draft["remunerations-resultat"] = undefined;
+        savePageData("remunerations-resultat", undefined);
+      }
       if (data.estCalculable !== formData[stepName]?.estCalculable) {
         draft[stepName] = getModifiedFormValues(dirtyFields, data) as DeclarationDTO[typeof stepName];
       } else {
         draft[stepName] = data as DeclarationDTO[typeof stepName];
       }
     });
-
     saveFormData(newFormData);
 
     return router.push(funnelConfig(newFormData)[stepName].next().url);
diff --git a/packages/app/src/app/(default)/index-egapro/declaration/resultat-global/ResultatGlobalForm.tsx b/packages/app/src/app/(default)/index-egapro/declaration/resultat-global/ResultatGlobalForm.tsx
index 83087adc19..51e2858b4e 100644
--- a/packages/app/src/app/(default)/index-egapro/declaration/resultat-global/ResultatGlobalForm.tsx
+++ b/packages/app/src/app/(default)/index-egapro/declaration/resultat-global/ResultatGlobalForm.tsx
@@ -49,10 +49,15 @@ const stepName: FunnelKey = "resultat-global";
 
 export const ResultatGlobalForm = () => {
   const router = useRouter();
-  const { formData, saveFormData } = useDeclarationFormManager();
+  const { formData, saveFormData, savePageData } = useDeclarationFormManager();
 
   assertOrRedirectCommencerStep(formData);
 
+  //FIXME: Sync renumaration with renuerationResultat when editing
+  if (formData.remunerations?.estCalculable === "non") {
+    savePageData("remunerations-resultat", undefined);
+  }
+
   const computed = computeDeclarationIndex(DeclarationComputerInputBuilder.fromDeclarationDTO(formData));
 
   // We don't compute the index if we only read an existing declaration.