diff --git a/Minecraft.World/LivingEntity.cpp b/Minecraft.World/LivingEntity.cpp
index 798a45f7..acaf00a4 100644
--- a/Minecraft.World/LivingEntity.cpp
+++ b/Minecraft.World/LivingEntity.cpp
@@ -213,7 +213,8 @@ void LivingEntity::baseTick()
 	if (!level->isClientSide && isAlive() && onGround && !isSneaking() && tickCount % 10 == 0)
 	{
 		int tileBelow = level->getTile(Mth::floor(x), Mth::floor(bb->y0) - 1, Mth::floor(z));
-		if (tileBelow == Tile::magma_block_Id)
+		bool hasFrostWalker = EnchantmentHelper::getEnchantmentLevel(Enchantment::frostWalker->id, getEquipmentSlots()) > 0;
+		if (tileBelow == Tile::magma_block_Id && !hasFrostWalker)
 		{
 			hurt(DamageSource::hotFloor, 1);
 		}