diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 2ad3161a2..3f2f99f49 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -573,6 +573,8 @@ abstract class Entity extends Location implements Metadatable{
 			}
 		}elseif($amount <= $this->getMaxHealth() or $amount < $this->health){
 			$this->health = (int) $amount;
+		}else{
+			$this->health = $this->getMaxHealth();
 		}
 	}