diff --git a/client/components/Map.tsx b/client/components/Map.tsx
index 2ab2a17..6168843 100644
--- a/client/components/Map.tsx
+++ b/client/components/Map.tsx
@@ -13,6 +13,7 @@ export default function Map() {
   return (
     <MapView
       logoEnabled={false}
+      compassViewPosition={2}
       style={styles.map}
       styleURL="https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json">
       {/* FIXME Il faudra pouvoir avoir un bouton de suivi pour activer le suivi de la caméro */}
@@ -32,9 +33,9 @@ export default function Map() {
 function PlayerLocationsMarkers() {
   const game = useGame()
   const lastPlayerLocations = useLastPlayerLocations()
-  return lastPlayerLocations
+  return lastPlayerLocations ? lastPlayerLocations
     .filter(playerLoc => playerLoc.playerId !== game.playerId)
-    .map(playerLoc => <PlayerLocationMarker key={`player-${playerLoc.playerId}-loc`} playerLocation={playerLoc} />)
+    .map(playerLoc => <PlayerLocationMarker key={`player-${playerLoc.playerId}-loc`} playerLocation={playerLoc} />) : <></>
 }
 
 function PlayerLocationMarker({ playerLocation }: { playerLocation: PlayerLocation }) {