diff --git a/src/item/Item.php b/src/item/Item.php
index 9c1119db3..a1ff42b9b 100644
--- a/src/item/Item.php
+++ b/src/item/Item.php
@@ -678,7 +678,7 @@ class Item implements \JsonSerializable{
 	 */
 	public static function nbtDeserialize(CompoundTag $tag) : Item{
 		if($tag->getTag("id") === null || $tag->getTag("Count") === null){
-			return ItemFactory::getInstance()->get(0);
+			return VanillaItems::AIR();
 		}
 
 		$count = Binary::unsignByte($tag->getByte("Count"));
diff --git a/src/network/mcpe/convert/TypeConverter.php b/src/network/mcpe/convert/TypeConverter.php
index de17acdb0..a8b8a8375 100644
--- a/src/network/mcpe/convert/TypeConverter.php
+++ b/src/network/mcpe/convert/TypeConverter.php
@@ -36,6 +36,7 @@ use pocketmine\item\Durable;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\ItemIds;
+use pocketmine\item\VanillaItems;
 use pocketmine\nbt\NbtException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
@@ -126,7 +127,7 @@ class TypeConverter{
 
 	public function recipeIngredientToCoreItemStack(RecipeIngredient $ingredient) : Item{
 		if($ingredient->getId() === 0){
-			return ItemFactory::getInstance()->get(ItemIds::AIR, 0, 0);
+			return VanillaItems::AIR();
 		}
 		[$id, $meta] = ItemTranslator::getInstance()->fromNetworkIdWithWildcardHandling($ingredient->getId(), $ingredient->getMeta());
 		return ItemFactory::getInstance()->get($id, $meta, $ingredient->getCount());
@@ -202,7 +203,7 @@ class TypeConverter{
 	 */
 	public function netItemStackToCore(ItemStack $itemStack) : Item{
 		if($itemStack->getId() === 0){
-			return ItemFactory::getInstance()->get(ItemIds::AIR, 0, 0);
+			return VanillaItems::AIR();
 		}
 		$compound = $itemStack->getNbt();