diff --git a/src/main/java/model/FireFighterScenario.java b/src/main/java/model/FireFighterScenario.java
index 48027ef5cad8e1f284cd2f37d59dd3cd02684bf4..786d1691cf5bace4aac6e7873cc85c7ea86d63ba 100644
--- a/src/main/java/model/FireFighterScenario.java
+++ b/src/main/java/model/FireFighterScenario.java
@@ -118,7 +118,7 @@ public class FireFighterScenario extends EntityScenario implements Board<Entity>
   public Position getNearestEntity(Position fromPos, Class<?> entityType) {
     int rows = matrix.getRows();
     int cols = matrix.getColumns();
-    Position nearestPosition = null;
+    Position nearestPosition = fromPos;
 
     // Définir la distance maximale possible
     int maxDistance = rows + cols;