diff --git a/front/src/applications/editor/Editor.tsx b/front/src/applications/editor/Editor.tsx
index be9f9b0c61b..a8847c9ff64 100644
--- a/front/src/applications/editor/Editor.tsx
+++ b/front/src/applications/editor/Editor.tsx
@@ -19,12 +19,12 @@ import { useSwitchTypes } from 'applications/editor/tools/switchEdition/types';
 import type { switchProps } from 'applications/editor/tools/switchProps';
 import type { CommonToolState } from 'applications/editor/tools/types';
 import { centerMapOnObject, selectEntities } from 'applications/editor/tools/utils';
-import type { ObjectType } from 'common/api/osrdEditoastApi';
+import { osrdEditoastApi, type ObjectType } from 'common/api/osrdEditoastApi';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import { LoaderState } from 'common/Loaders';
 import MapButtons from 'common/Map/Buttons/MapButtons';
 import MapSearch from 'common/Map/Search/MapSearch';
-import { useInfraID, useOsrdActions } from 'common/osrdContext';
+import { useInfraActions, useInfraID, useOsrdActions } from 'common/osrdContext';
 import Tipped from 'common/Tipped';
 import type { EditorSliceActions } from 'reducers/editor';
 import { getEditorState, getInfraLockStatus } from 'reducers/editor/selectors';
@@ -49,8 +49,8 @@ const Editor = () => {
   const { urlInfra } = useParams();
   const infraID = useInfraID();
   const [searchParams, setSearchParams] = useSearchParams();
-  const isLocked = useSelector(getInfraLockStatus);
   const isLoading = useSelector(getIsLoading);
+  const isLocked = useSelector(getInfraLockStatus);
   const editorState = useSelector(getEditorState);
   const switchTypes = useSwitchTypes(infraID);
   /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -65,6 +65,13 @@ const Editor = () => {
   }, [setRenderingFingerprint]);
 
   const [isFormSubmited, setIsFormSubmited] = useState(false);
+  const { data: infra } = osrdEditoastApi.endpoints.getInfraById.useQuery(
+    { id: infraID as number },
+    {
+      skip: !infraID,
+    }
+  );
+  const { updateInfra } = useInfraActions();
 
   const switchTool = useCallback(
     ({ toolType, toolState }: switchProps) => {
@@ -312,6 +319,12 @@ const Editor = () => {
     }
   }, [toolAndState.state.entity?.properties.id]);
 
+  useEffect(() => {
+    if (infra) {
+      dispatch(updateInfra(infra));
+    }
+  }, [infra]);
+
   return (
     <EditorContext.Provider value={extendedContext as EditorContextType<unknown>}>
       <main
diff --git a/front/src/applications/editor/tools/rangeEdition/tool-factory.tsx b/front/src/applications/editor/tools/rangeEdition/tool-factory.tsx
index 947f7ed38f6..a56548d09c1 100644
--- a/front/src/applications/editor/tools/rangeEdition/tool-factory.tsx
+++ b/front/src/applications/editor/tools/rangeEdition/tool-factory.tsx
@@ -97,8 +97,8 @@ function getRangeEditionTool<T extends EditorRange>({
           id: `save-${objectTypeAction}`,
           icon: AiFillSave,
           labelTranslationKey: `Editor.tools.${objectTypeEdition}-edition.actions.save-${objectTypeAction}`,
-          isDisabled({ isLoading, state }) {
-            if (isLoading) return true;
+          isDisabled({ isLoading, isInfraLocked, state }) {
+            if (isLoading || isInfraLocked) return true;
             if (canSave) return !canSave(state);
             return false;
           },
diff --git a/front/src/applications/editor/tools/switchEdition/tool.tsx b/front/src/applications/editor/tools/switchEdition/tool.tsx
index bc049915594..c9b7273c703 100644
--- a/front/src/applications/editor/tools/switchEdition/tool.tsx
+++ b/front/src/applications/editor/tools/switchEdition/tool.tsx
@@ -49,7 +49,7 @@ const SwitchEditionTool: Tool<SwitchEditionState> = {
         id: 'save-switch',
         icon: AiFillSave,
         labelTranslationKey: 'Editor.tools.switch-edition.actions.save-switch',
-        isDisabled({ isLoading, state }) {
+        isDisabled({ isLoading, isInfraLocked, state }) {
           const portWithTracks = filter(state.entity?.properties?.ports ?? {}, (p) => !!p?.track);
           const portsKeys = Object.keys(state.entity?.properties?.ports ?? {});
           const detectedDuplicates = filter(
@@ -61,6 +61,7 @@ const SwitchEditionTool: Tool<SwitchEditionState> = {
             portWithTracks.length !== portsKeys.length ||
             !!detectedDuplicates.length ||
             isLoading ||
+            isInfraLocked ||
             false
           );
         },