diff --git a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java
index 5ab8aa87..47b6784a 100644
--- a/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java
+++ b/fabric-1.20/src/main/java/org/dynmap/fabric_1_20/DynmapPlugin.java
@@ -167,6 +167,7 @@ public class DynmapPlugin {
                 //Log.info("statename=" + bn + "[" + statename + "], lightAtten=" + lightAtten);
                 // Fill in base attributes
                 bld.setBaseState(basebs).setStateIndex(idx - baseidx).setBlockName(bn).setStateName(statename).setLegacyBlockID(idx).setAttenuatesLight(lightAtten);
+                if (bs.getSoundGroup() != null) { bld.setMaterial(bs.getSoundGroup().toString()); }
 				if (bs.isSolid()) { bld.setSolid(); }
 				if (bs.isAir()) { bld.setAir(); }
 				if (bs.isIn(BlockTags.LOGS)) { bld.setLog(); }
diff --git a/forge-1.20/src/main/java/org/dynmap/forge_1_20/DynmapPlugin.java b/forge-1.20/src/main/java/org/dynmap/forge_1_20/DynmapPlugin.java
index 7aef41a4..893535a8 100644
--- a/forge-1.20/src/main/java/org/dynmap/forge_1_20/DynmapPlugin.java
+++ b/forge-1.20/src/main/java/org/dynmap/forge_1_20/DynmapPlugin.java
@@ -27,7 +27,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.regex.Pattern;
 
-import net.minecraft.Util;
 import net.minecraft.commands.CommandSource;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -37,7 +36,6 @@ import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.Connection;
-import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
 import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
@@ -50,6 +48,7 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.server.players.GameProfileCache;
 import net.minecraft.server.players.UserBanList;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.LevelAccessor;
@@ -263,8 +262,8 @@ public class DynmapPlugin
                 if (bs.getSoundType() != null) { bld.setMaterial(bs.getSoundType().toString()); }
 				if (bs.isSolid()) { bld.setSolid(); }
 				if (bs.isAir()) { bld.setAir(); }
-				if (bs.getSoundType() == SoundType.WOOD) { bld.setLog(); }
-				if (b instanceof LeavesBlock) { bld.setLeaves(); }
+				if (bs.is(BlockTags.LOGS)) { bld.setLog(); }
+				if (bs.is(BlockTags.LEAVES)) { bld.setLeaves(); }
 				if ((!bs.getFluidState().isEmpty()) && !(bs.getBlock() instanceof LiquidBlock)) {
 					bld.setWaterlogged();
 				}