diff --git a/Minecraft.World/TallGrass2.cpp b/Minecraft.World/TallGrass2.cpp
index 93c0538c..e9998c21 100644
--- a/Minecraft.World/TallGrass2.cpp
+++ b/Minecraft.World/TallGrass2.cpp
@@ -189,11 +189,12 @@ void TallGrass2::neighborChanged(Level* level, int x, int y, int z, int type)
 
 	if (!isUpper)
 	{
-		if (!canSurvive(level, x, y, z))
+		int upperTileId = level->getTile(x, y + 1, z);
+		if (!canSurvive(level, x, y, z) || (upperTileId != id))
 		{
 			spawnResources(level, x, y, z, data, 0);
 			level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
-			if (level->getTile(x, y + 1, z) == id)
+			if (upperTileId == id)
 				level->removeTile(x, y + 1, z);
 		}
 	}
@@ -211,11 +212,12 @@ void TallGrass2::tick(Level* level, int x, int y, int z, Random* random)
 
 	if (!isUpper)
 	{
-		if (!canSurvive(level, x, y, z))
+		int upperTileId = level->getTile(x, y + 1, z);
+		if (!canSurvive(level, x, y, z) || (upperTileId != id))
 		{
 			spawnResources(level, x, y, z, data, 0);
 			level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
-			if (level->getTile(x, y + 1, z) == id)
+			if (upperTileId == id)
 				level->removeTile(x, y + 1, z);
 		}
 	}
@@ -224,7 +226,6 @@ void TallGrass2::tick(Level* level, int x, int y, int z, Random* random)
 
 int TallGrass2::getResource(int data, Random* random, int playerBonusLevel)
 {
-
 	return -1;
 }
 
@@ -240,7 +241,6 @@ bool TallGrass2::isSilkTouchable()
 
 shared_ptr<ItemInstance> TallGrass2::getSilkTouchItemInstance(int data)
 {
-
 	if ((data & UPPER_BIT) != 0) return nullptr;
 	int variant = data & ~UPPER_BIT;
 	return std::make_shared<ItemInstance>(this, 1, variant);