diff --git a/src/main/java/io/ib67/sfcraft/module/chat/decorator/ChatShowoffModule.java b/src/main/java/io/ib67/sfcraft/module/chat/decorator/ChatShowoffModule.java
index 33b5af9..42c6f84 100644
--- a/src/main/java/io/ib67/sfcraft/module/chat/decorator/ChatShowoffModule.java
+++ b/src/main/java/io/ib67/sfcraft/module/chat/decorator/ChatShowoffModule.java
@@ -6,6 +6,7 @@ import io.ib67.sfcraft.registry.chat.SimpleMessageDecorator;
 import net.minecraft.network.chat.ChatDecorator;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.Items;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
@@ -23,12 +24,15 @@ public class ChatShowoffModule extends ServerModule implements ChatDecorator {
         if (!isEnabled()) {
             return message;
         }
+        if(player == null || player.getMainHandItem().is(Items.AIR)) { return message; }
 
         return ReplaceHelper.replace(player, message, ".item", this::generateShowoffText);
     }
 
     private Component generateShowoffText(ServerPlayer serverPlayer) {
         var item = serverPlayer.getMainHandItem();
-        return item.getDisplayName();
+        return item.count() > 1 ?
+                Component.literal(" "+item.count()+"x ").append(item.getDisplayName())
+                : Component.literal(" ").append(item.getDisplayName());
     }
 }