diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 5e63a58418..e1ed293214 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -107,11 +107,19 @@ public class GeoEngine
 		
 		_log.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
-		// Avoid wrong config when no files loaded
-		if ((loaded == 0) && (Config.COORD_SYNCHRONIZE == 2))
+		// avoid wrong configs when no files are loaded
+		if (loaded == 0)
 		{
-			Config.COORD_SYNCHRONIZE = -1;
-			_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			if (Config.PATHFINDING)
+			{
+				Config.PATHFINDING = false;
+				_log.info("GeoEngine: Forcing PathFinding setting to false.");
+			}
+			if (Config.COORD_SYNCHRONIZE == 2)
+			{
+				Config.COORD_SYNCHRONIZE = -1;
+				_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			}
 		}
 		
 		// release multilayer block temporarily buffer
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 5e63a58418..e1ed293214 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -107,11 +107,19 @@ public class GeoEngine
 		
 		_log.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
-		// Avoid wrong config when no files loaded
-		if ((loaded == 0) && (Config.COORD_SYNCHRONIZE == 2))
+		// avoid wrong configs when no files are loaded
+		if (loaded == 0)
 		{
-			Config.COORD_SYNCHRONIZE = -1;
-			_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			if (Config.PATHFINDING)
+			{
+				Config.PATHFINDING = false;
+				_log.info("GeoEngine: Forcing PathFinding setting to false.");
+			}
+			if (Config.COORD_SYNCHRONIZE == 2)
+			{
+				Config.COORD_SYNCHRONIZE = -1;
+				_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			}
 		}
 		
 		// release multilayer block temporarily buffer
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 5e63a58418..e1ed293214 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -107,11 +107,19 @@ public class GeoEngine
 		
 		_log.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
-		// Avoid wrong config when no files loaded
-		if ((loaded == 0) && (Config.COORD_SYNCHRONIZE == 2))
+		// avoid wrong configs when no files are loaded
+		if (loaded == 0)
 		{
-			Config.COORD_SYNCHRONIZE = -1;
-			_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			if (Config.PATHFINDING)
+			{
+				Config.PATHFINDING = false;
+				_log.info("GeoEngine: Forcing PathFinding setting to false.");
+			}
+			if (Config.COORD_SYNCHRONIZE == 2)
+			{
+				Config.COORD_SYNCHRONIZE = -1;
+				_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			}
 		}
 		
 		// release multilayer block temporarily buffer
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index bbc61c4a02..6b7a211ece 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -105,11 +105,19 @@ public class GeoEngine
 		
 		_log.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
-		// Avoid wrong config when no files loaded
-		if ((loaded == 0) && (Config.COORD_SYNCHRONIZE == 2))
+		// avoid wrong configs when no files are loaded
+		if (loaded == 0)
 		{
-			Config.COORD_SYNCHRONIZE = -1;
-			_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			if (Config.PATHFINDING)
+			{
+				Config.PATHFINDING = false;
+				_log.info("GeoEngine: Forcing PathFinding setting to false.");
+			}
+			if (Config.COORD_SYNCHRONIZE == 2)
+			{
+				Config.COORD_SYNCHRONIZE = -1;
+				_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			}
 		}
 		
 		// release multilayer block temporarily buffer
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
index 5e63a58418..e1ed293214 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -107,11 +107,19 @@ public class GeoEngine
 		
 		_log.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
-		// Avoid wrong config when no files loaded
-		if ((loaded == 0) && (Config.COORD_SYNCHRONIZE == 2))
+		// avoid wrong configs when no files are loaded
+		if (loaded == 0)
 		{
-			Config.COORD_SYNCHRONIZE = -1;
-			_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			if (Config.PATHFINDING)
+			{
+				Config.PATHFINDING = false;
+				_log.info("GeoEngine: Forcing PathFinding setting to false.");
+			}
+			if (Config.COORD_SYNCHRONIZE == 2)
+			{
+				Config.COORD_SYNCHRONIZE = -1;
+				_log.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
+			}
 		}
 		
 		// release multilayer block temporarily buffer