diff --git a/site/source/hooks/useGérerPath.ts b/site/source/hooks/useGérerPath.ts
deleted file mode 100644
index c8f88ae2b..000000000
--- a/site/source/hooks/useGérerPath.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { SitePathsContext } from '@/components/utils/SitePathsContext'
-import { companySituationSelector } from '@/selectors/simulationSelectors'
-import { useContext } from 'react'
-import { useSelector } from 'react-redux'
-import { generatePath } from 'react-router'
-
-export const useGérerPath = () => {
-	const sitePaths = useContext(SitePathsContext)
-	const company = useSelector(companySituationSelector)
-	const siren = (company['entreprise . SIREN'] as string).replace(/'/g, '')
-
-	return generatePath(sitePaths.gérer.index, { entreprise: siren })
-}
diff --git a/site/source/pages/Landing/SearchOrCreate.tsx b/site/source/pages/Landing/SearchOrCreate.tsx
index 54b18c048..9061f98d4 100644
--- a/site/source/pages/Landing/SearchOrCreate.tsx
+++ b/site/source/pages/Landing/SearchOrCreate.tsx
@@ -41,7 +41,7 @@ export default function SearchOrCreate() {
 						<Spacing md />
 						<AnswerGroup>
 							<Button
-								to={generatePath(sitePaths.gérer.index, {
+								to={generatePath(sitePaths.gérer.entreprise, {
 									entreprise: companySIREN as string,
 								})}
 							>
@@ -92,10 +92,10 @@ function useHandleCompanySubmit() {
 			}
 			setEntreprise(établissement)
 			const entreprise = établissement.siren
-			const path = generatePath(sitePaths.gérer.index, { entreprise })
+			const path = generatePath(sitePaths.gérer.entreprise, { entreprise })
 			history.push(path)
 		},
-		[history, setEntreprise, sitePaths.gérer.index]
+		[history, setEntreprise, sitePaths.gérer.entreprise]
 	)
 
 	return handleCompanySubmit
diff --git a/site/source/pages/Simulateurs/index.tsx b/site/source/pages/Simulateurs/index.tsx
index be931e2e7..3720b7226 100644
--- a/site/source/pages/Simulateurs/index.tsx
+++ b/site/source/pages/Simulateurs/index.tsx
@@ -3,7 +3,6 @@ import { usePersistingState } from '@/components/utils/persistState'
 import { ScrollToTop } from '@/components/utils/Scroll'
 import { SitePathsContext } from '@/components/utils/SitePathsContext'
 import { Link } from '@/design-system/typography/link'
-import { useGérerPath } from '@/hooks/useGérerPath'
 import { useContext, useEffect, useMemo } from 'react'
 import { Trans } from 'react-i18next'
 import { Route, Switch, useLocation } from 'react-router-dom'
@@ -13,7 +12,6 @@ import SimulateurPage from '../../components/PageData'
 
 export default function Simulateurs() {
 	const sitePaths = useContext(SitePathsContext)
-	const gérerPath = useGérerPath()
 	const { state, pathname } = useLocation()
 	const [lastState, setLastState] = usePersistingState<{
 		fromGérer?: boolean
@@ -47,7 +45,7 @@ export default function Simulateurs() {
 
 			{pathname !== sitePaths.simulateurs.index &&
 				(lastState?.fromGérer ? (
-					<Link to={gérerPath}>
+					<Link to={sitePaths.gérer.index}>
 						← <Trans>Retour à mon activité</Trans>
 					</Link>
 				) : lastState?.fromCréer ? (
diff --git a/site/source/pages/gerer/index.tsx b/site/source/pages/gerer/index.tsx
index f0c4fbdfb..91201504c 100644
--- a/site/source/pages/gerer/index.tsx
+++ b/site/source/pages/gerer/index.tsx
@@ -28,16 +28,18 @@ import { Li, Ul } from '@/design-system/typography/list'
 import { Body, Intro } from '@/design-system/typography/paragraphs'
 import { useQuestionList } from '@/hooks/useQuestionList'
 import { useSetEntreprise } from '@/hooks/useSetEntreprise'
+import { companySituationSelector } from '@/selectors/simulationSelectors'
 import { evaluateQuestion } from '@/utils'
 import { Grid } from '@mui/material'
 import { useOverlayTriggerState } from '@react-stately/overlays'
 import { DottedName } from 'modele-social'
 import Engine, { Evaluation } from 'publicodes'
-import { useContext, useEffect, useState } from 'react'
+import { useContext, useEffect, useRef, useState } from 'react'
 import { Helmet } from 'react-helmet-async'
 import { Trans, useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import {
+	generatePath,
 	Redirect,
 	Route,
 	Switch,
@@ -64,7 +66,10 @@ export default function Gérer() {
 	const sitePaths = useContext(SitePathsContext)
 	const location = useLocation()
 	const simulateurs = useSimulatorsData()
-	const showLink = !useRouteMatch({ path: sitePaths.gérer.index, exact: true })
+	const showLink = !useRouteMatch({
+		path: [sitePaths.gérer.index, sitePaths.gérer.entreprise],
+		exact: true,
+	})
 
 	return (
 		<>
@@ -77,11 +82,6 @@ export default function Gérer() {
 
 			<TrackChapter chapter1="gerer">
 				<Switch>
-					<Route
-						exact
-						path={[sitePaths.gérer.index, sitePaths.gérer.siren]}
-						component={Home}
-					/>
 					<Route
 						path={sitePaths.gérer.sécuritéSociale}
 						component={SocialSecurity}
@@ -99,6 +99,11 @@ export default function Gérer() {
 							render={() => <PageData {...p} />}
 						/>
 					))}
+					<Route
+						exact
+						path={[sitePaths.gérer.index, sitePaths.gérer.entreprise]}
+						component={Home}
+					/>
 				</Switch>
 			</TrackChapter>
 		</>
@@ -179,13 +184,15 @@ function Home() {
 	const engine = useEngine()
 	const dispatch = useDispatch()
 	const engineSiren = engine.evaluate('entreprise . SIREN').nodeValue
-	const [overwrite, setOverwrite] = useState(false)
+	const [overwrite, setOverwrite] = useState(engineSiren === undefined)
 	const { param, entreprise, entrepriseNotFound, entreprisePending } =
 		useSirenFromParams(overwrite)
+	const gérerPath = useGérerPath()
 
 	const setEntreprise = useSetEntreprise()
 
 	const updateEntrprise =
+		overwrite &&
 		!entreprisePending &&
 		!entrepriseNotFound &&
 		entreprise &&
@@ -194,10 +201,22 @@ function Home() {
 	useEffect(() => {
 		if (updateEntrprise) {
 			setEntreprise(entreprise)
+			setOverwrite(false)
 		}
 	}, [entreprise, setEntreprise, updateEntrprise])
 
-	if ((!param && !engineSiren) || (param && entrepriseNotFound)) {
+	if (
+		gérerPath &&
+		(param == null || (entreprise?.siren && entreprise.siren !== param))
+	) {
+		return <Redirect to={gérerPath} />
+	}
+
+	if (
+		(!param && !engineSiren) ||
+		(param && entrepriseNotFound) ||
+		(entreprise && !overwrite && !engineSiren)
+	) {
 		return <Redirect to={sitePaths.index} />
 	}
 
@@ -512,6 +531,19 @@ const PopoverOverwriteSituation = ({
 	)
 }
 
+const useGérerPath = () => {
+	const sitePaths = useContext(SitePathsContext)
+	const company = useSelector(companySituationSelector)
+
+	if (company['entreprise . SIREN']) {
+		const siren = (company['entreprise . SIREN'] as string).replace(/'/g, '')
+
+		return generatePath(sitePaths.gérer.entreprise, { entreprise: siren })
+	}
+
+	return null
+}
+
 const useSirenFromParams = (overwrite: boolean) => {
 	const { entreprise: param } = useParams<{ entreprise?: string }>()
 	const [entreprise, setEntreprise] = useState<FabriqueSocialEntreprise | null>(
@@ -525,11 +557,13 @@ const useSirenFromParams = (overwrite: boolean) => {
 
 	const pass = param && param !== engineSiren && !overwrite
 
+	const once = useRef(false)
 	useEffect(() => {
 		let canceled = false
-		if (!param || pass) {
+		if (!param || pass || once.current) {
 			return
 		}
+		once.current = true
 		setEntreprisePending(true)
 		searchDenominationOrSiren(param)
 			.then((entreprises) => {
diff --git a/site/source/sitePaths.ts b/site/source/sitePaths.ts
index a233fd38b..aa60f7090 100644
--- a/site/source/sitePaths.ts
+++ b/site/source/sitePaths.ts
@@ -33,7 +33,8 @@ const rawSitePathsFr = {
 		},
 	},
 	gérer: {
-		index: '/gérer/:entreprise',
+		index: '/gérer',
+		entreprise: '/:entreprise',
 		embaucher: '/embaucher',
 		sécuritéSociale: '/sécurité-sociale',
 		'déclaration-charges-sociales-indépendant':
@@ -111,7 +112,8 @@ const rawSitePathsEn = {
 		},
 	},
 	gérer: {
-		index: '/manage/:entreprise',
+		index: '/manage',
+		entreprise: '/:entreprise',
 		embaucher: '/hiring',
 		sécuritéSociale: '/social-security',
 		'déclaration-charges-sociales-indépendant':