diff --git a/src/pocketmine/network/protocol/LoginPacket.php b/src/pocketmine/network/protocol/LoginPacket.php
index f287f97a7..7ef9ff0c5 100644
--- a/src/pocketmine/network/protocol/LoginPacket.php
+++ b/src/pocketmine/network/protocol/LoginPacket.php
@@ -44,10 +44,11 @@ class LoginPacket extends DataPacket{
 		$this->username = $this->getString();
 		$this->protocol1 = $this->getInt();
 		$this->protocol2 = $this->getInt();
+		$this->clientId = $this->getInt();
 		if($this->protocol1 < 21){ //New fields!
+			$this->setBuffer(null, 0); //Skip batch packet handling
 			return;
 		}
-		$this->clientId = $this->getInt();
 		$this->slim = $this->getByte() > 0;
 		$this->skin = $this->getString();
 	}