diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/LMSPasterProtocol.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/LMSPasterProtocol.java
index 1c535dd3..da0ffb4e 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/LMSPasterProtocol.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/LMSPasterProtocol.java
@@ -7,6 +7,7 @@ import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import org.leavesmc.leaves.LeavesConfig;
@@ -67,9 +68,9 @@ public class LMSPasterProtocol implements LeavesProtocol {
     private static void triggerCommand(ServerPlayer player, String playerName, String command) {
         if (command.isEmpty()) {
             LeavesLogger.LOGGER.warning(String.format("Player %s sent an empty command", playerName));
-        } else {
-            player.getBukkitEntity().performCommand(command);
+            return;
         }
+        MinecraftServer.getServer().execute(() -> player.getBukkitEntity().performCommand(command));
     }
 
     @Override
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java
index a0916567..2999e795 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java
@@ -13,6 +13,7 @@ import net.minecraft.world.entity.vehicle.ContainerEntity;
 import net.minecraft.world.inventory.PlayerEnderChestContainer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.ChestBlock;
+import net.minecraft.world.level.block.EnderChestBlock;
 import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
 import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
@@ -99,6 +100,9 @@ public enum ItemStorageExtensionProvider implements IServerExtensionProvider<Ite
             case ContainerEntity containerEntity when containerEntity.getContainerLootTable() != null -> {
                 return List.of();
             }
+            case EnderChestBlockEntity enderChest when request.getPlayer().getEnderChestInventory().isEmpty() -> {
+                return List.of();
+            }
             default -> {
             }
         }