diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 5e2b7967c..404c57be7 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -660,6 +660,8 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 				$this->server->broadcastMessage($ev->getJoinMessage());
 			}
 
+			$this->noDamageTicks = 60;
+
 			$this->spawnToAll();
 
 			if($this->server->getUpdater()->hasUpdate() and $this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){
@@ -2001,6 +2003,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 				$this->fireTicks = 0;
 				$this->airTicks = 300;
 				$this->deadTicks = 0;
+				$this->noDamageTicks = 60;
 
 				$this->setHealth(20);
 				$this->dead = false;