diff --git a/src/components/ebike/Ebike.tsx b/src/components/ebike/Ebike.tsx
index b42fcd2..dac7b9d 100644
--- a/src/components/ebike/Ebike.tsx
+++ b/src/components/ebike/Ebike.tsx
@@ -17,7 +17,7 @@ interface CameraTransform {
 
 const EBIKE_CAMERA_TRANSFORM: CameraTransform = {
   position: [-3, 8, 0],
-  rotation: [0, 90, 0],
+  rotation: [90, 90, 90],
 };
 
 const EBIKE_DROP_PLAYER_TRANSFORM: CameraTransform = {
@@ -33,7 +33,7 @@ export function Ebike({ position }: EbikeProps): React.JSX.Element {
   const groupRef = useRef<THREE.Group>(null);
   const { scene } = useLoggedGLTF(EBIKE_MODEL_PATH, {
     scope: "Ebike",
-    position: [0, 0, 0],
+    position: position,
   });
   const model = useClonedObject(scene);
   const movementMode = useGameStore((state) => state.player.movementMode);
@@ -94,22 +94,24 @@ export function Ebike({ position }: EbikeProps): React.JSX.Element {
   };
 
   return (
-    <group ref={groupRef} position={position}>
-      <primitive object={model} />
-      <InteractableObject
-        kind="trigger"
-        label={
-          movementMode === "walk" ? "Monter sur le bike" : "Descendre du bike"
-        }
-        position={position}
-        radius={10}
-        onPress={handleInteract}
-      >
-        <mesh>
-          <boxGeometry args={[1.5, 1.5, 1.5]} />
-          <meshStandardMaterial color="red" opacity={0.5} transparent />
-        </mesh>
-      </InteractableObject>
+    <>
+      <group ref={groupRef} position={position}>
+        <primitive object={model} />
+        <InteractableObject
+          kind="trigger"
+          label={
+            movementMode === "walk" ? "Monter sur le bike" : "Descendre du bike"
+          }
+          position={position}
+          radius={10}
+          onPress={handleInteract}
+        >
+          <mesh>
+            <boxGeometry args={[1.5, 1.5, 1.5]} />
+            <meshStandardMaterial color="red" opacity={0.5} transparent />
+          </mesh>
+        </InteractableObject>
+      </group>
       {debugRef.current.showCameraPoints && (
         <>
           <mesh position={camPointPos}>
@@ -130,6 +132,6 @@ export function Ebike({ position }: EbikeProps): React.JSX.Element {
           </mesh>
         </>
       )}
-    </group>
+    </>
   );
 }
diff --git a/src/world/GameStageContent.tsx b/src/world/GameStageContent.tsx
index e31b163..359b2a4 100644
--- a/src/world/GameStageContent.tsx
+++ b/src/world/GameStageContent.tsx
@@ -57,7 +57,7 @@ export function GameStageContent(): React.JSX.Element {
       {mainState === "intro" ? (
         <StageAnchor color="#7dd3fc" position={[0, 4, 0]} />
       ) : null}
-      <Ebike position={[0, 5, 0]} />
+      <Ebike position={[0, 10, 0]} />
       {GAME_REPAIR_ZONES.map((zone) => (
         <RepairGame
           key={zone.mission}
diff --git a/src/world/player/PlayerController.tsx b/src/world/player/PlayerController.tsx
index 6ecaa17..e31f0c9 100644
--- a/src/world/player/PlayerController.tsx
+++ b/src/world/player/PlayerController.tsx
@@ -109,6 +109,11 @@ export function PlayerController({
   const canMove = useGameStore((state) => state.missionFlow.canMove);
   const currentSpeed = useGameStore((state) => state.player.currentSpeed);
   const movementMode = useGameStore((state) => state.player.movementMode);
+  const movementModeRef = useRef(movementMode);
+
+  useEffect(() => {
+    movementModeRef.current = movementMode;
+  }, [movementMode]);
 
   const capsule = useRef(createSpawnCapsule(spawnPosition));
 
@@ -283,7 +288,7 @@ export function PlayerController({
       }
     }
 
-    if (movementMode !== "ebike") {
+    if (movementModeRef.current !== "ebike") {
       camera.position.copy(capsule.current.end);
     }
   });