diff --git a/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx b/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx
index c8e10ff300b..c3a96917c97 100644
--- a/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx
+++ b/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx
@@ -269,7 +269,8 @@ const SimulationWarpedMap: FC<{ collapsed?: boolean }> = ({ collapsed }) => {
         setState({ ...state, osrd: newTransformedOSRDData });
       }
     });
-  }, [state]);
+    // We call the function only if the state's type change otherwise we go to an infinite loop
+  }, [state.type]);
 
   return (
     <div
diff --git a/front/src/reducers/osrdconf/index.ts b/front/src/reducers/osrdconf/index.ts
index 8d600a5c2cc..1c013dabdbd 100644
--- a/front/src/reducers/osrdconf/index.ts
+++ b/front/src/reducers/osrdconf/index.ts
@@ -435,11 +435,16 @@ export function updateInfraID(infraID: number | undefined): ThunkAction<ActionUp
 
     if (infraID) {
       try {
-        // get switch types  with rtk query
-        const { data: newSwitchTypes = [] } = await dispatch(
+        // We use this syntax first because of the .initiate, to be able to unsubscribe from the results later
+        const results = dispatch(
           osrdEditoastApi.endpoints.getInfraByIdSwitchTypes.initiate({ id: infraID })
         );
+        const { data: newSwitchTypes = [] } = await results;
         dispatch(updateSwitchTypes(newSwitchTypes as SwitchType[]));
+
+        // Manually dispatching an RTK request with .initiate will create a subscription entry, but we need to unsubscribe from that data also manually - otherwise the data stays in the cache permanently.
+        // This prevents unwanted api calls
+        results.unsubscribe();
       } catch (e) {
         /* empty */
       }