diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 7b46d5d923..1be5a06f05 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12703,7 +12703,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12711,12 +12711,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index d504b68354..703fe6c659 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12710,7 +12710,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12718,12 +12718,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 9064da3d00..0319b6bb46 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12712,7 +12712,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12720,12 +12720,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6094232c90..6277c3ee3c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12692,7 +12692,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12700,12 +12700,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 11d03bad01..33f7edcae2 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12678,7 +12678,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12686,12 +12686,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 9d763917dd..d218f49abe 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12681,7 +12681,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12689,12 +12689,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0eef006c8f..b2f3cd0d26 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12687,7 +12687,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12695,12 +12695,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index dbea2ad7da..810f5d6acf 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12633,7 +12633,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12641,12 +12641,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index a8a6573198..2e61286bb1 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -17136,7 +17136,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -17144,6 +17144,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getFallHeight())
 		{
+			_fallingTimestamp = 0;
+			return false;
+		}
+		
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
+		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
+		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index faf612d441..4eb6294c8d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13698,7 +13698,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -13706,12 +13706,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index efa085fc01..da321cac22 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13585,7 +13585,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -13593,12 +13593,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0b953e2b47..2d30fcbbf8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12545,7 +12545,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12553,12 +12553,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 1f9017df77..4c36275955 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12552,7 +12552,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12560,12 +12560,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index bf2dff922f..af543b939a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12537,7 +12537,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12545,12 +12545,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 9f1fd4fe09..cdf65deb5e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12579,7 +12579,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12587,12 +12587,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 8b89daa375..bb950ddf03 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12579,7 +12579,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12587,12 +12587,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 43be56d952..7fff519869 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12459,7 +12459,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12467,12 +12467,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 34cc3b2677..9732a1bb6e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12561,7 +12561,7 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (System.currentTimeMillis() < _fallingTimestamp)
+		if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp))
 		{
 			return true;
 		}
@@ -12569,12 +12569,14 @@ public class PlayerInstance extends Playable
 		final int deltaZ = getZ() - z;
 		if (deltaZ <= getBaseTemplate().getSafeFallHeight())
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}
 		
-		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		// If there is no geodata loaded for the place we are, client Z correction might cause falling damage.
 		if (!GeoEngine.getInstance().hasGeo(getX(), getY()))
 		{
+			_fallingTimestamp = 0;
 			return false;
 		}