diff --git a/src/pocketmine/inventory/PlayerInventory.php b/src/pocketmine/inventory/PlayerInventory.php
index 491ca03fd..d3c8a2ccc 100644
--- a/src/pocketmine/inventory/PlayerInventory.php
+++ b/src/pocketmine/inventory/PlayerInventory.php
@@ -202,8 +202,8 @@ class PlayerInventory extends BaseInventory{
 	public function setItem($index, Item $item, $source = null){
 		if($index < 0 or $index >= $this->size){
 			return false;
-		}elseif($item->getID() === 0){
-			$this->clear($index, $source);
+		}elseif($item->getID() === 0 or $item->getCount() <= 0){
+			return $this->clear($index, $source);
 		}
 
 		if($index >= $this->getSize()){ //Armor change