diff --git a/src/main/java/me/metallicgoat/tweaksaddon/config/MainConfig.java b/src/main/java/me/metallicgoat/tweaksaddon/config/MainConfig.java
index 2c5c588..4da3a3b 100644
--- a/src/main/java/me/metallicgoat/tweaksaddon/config/MainConfig.java
+++ b/src/main/java/me/metallicgoat/tweaksaddon/config/MainConfig.java
@@ -324,7 +324,8 @@ public class MainConfig {
 
   @Config(
       description = {
-          "Prevents player from opening a bases' chest if bases team is still alive"
+          "Prevents player from opening a bases' chest if bases team is still alive",
+          "Note: You may want to disable team chests in MBedwars, as it works like a shared team Ender Chest"
       }
   )
   public static boolean lock_team_chest_enabled = true;
diff --git a/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/LockTeamChest.java b/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/LockTeamChest.java
index 771b31c..a6e324d 100644
--- a/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/LockTeamChest.java
+++ b/src/main/java/me/metallicgoat/tweaksaddon/tweaks/misc/LockTeamChest.java
@@ -7,6 +7,7 @@
 import de.marcely.bedwars.tools.location.XYZYP;
 import me.metallicgoat.tweaksaddon.config.MainConfig;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -14,10 +15,12 @@
 
 public class LockTeamChest implements Listener {
 
+  // Many people will want team chests disabled, use this with only regular chests
   @EventHandler
   public void playerOpenArenaChest(PlayerOpenArenaChestEvent event) {
-    // Dont mess with TeamChests, handled by MBedwars
-    if (!MainConfig.lock_team_chest_enabled || event.isTeamChest())
+    final Block teamChestBlock = event.getChestBlock();
+
+    if (!MainConfig.lock_team_chest_enabled || teamChestBlock.getType() == Material.ENDER_CHEST)
       return;
 
     final Arena arena = event.getArena();
@@ -26,12 +29,11 @@ public void playerOpenArenaChest(PlayerOpenArenaChestEvent event) {
     final Team chestTeam = getChestTeam(arena, event.getChestBlock());
 
     if (chestTeam != null && !arena.getPlayersInTeam(chestTeam).isEmpty() && chestTeam != playerTeam) {
-      final String failOpen = Message.build(MainConfig.lock_team_chest_fail_open)
+      Message.build(MainConfig.lock_team_chest_fail_open)
           .placeholder("team-name", chestTeam.getDisplayName())
           .placeholder("team", chestTeam.getDisplayName())
-          .done();
+          .send(player);
 
-      player.sendMessage(failOpen);
       event.setCancelled(true);
     }
   }