diff --git a/src/pocketmine/block/Lava.php b/src/pocketmine/block/Lava.php
index 726844205..8d1e1127e 100644
--- a/src/pocketmine/block/Lava.php
+++ b/src/pocketmine/block/Lava.php
@@ -49,6 +49,10 @@ class Lava extends Liquid{
 		if(!$ev->isCancelled()){
 			$entity->setOnFire($ev->getDuration());
 		}
+
+		if($entity instanceof Player){
+			$entity->onGround = true;
+		}
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
diff --git a/src/pocketmine/block/Water.php b/src/pocketmine/block/Water.php
index 4ca589815..8a8bbe3be 100644
--- a/src/pocketmine/block/Water.php
+++ b/src/pocketmine/block/Water.php
@@ -36,6 +36,10 @@ class Water extends Liquid{
 		if($entity->fireTicks > 0){
 			$entity->extinguish();
 		}
+
+		if($entity instanceof Player){
+			$entity->onGround = true;
+		}
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){