diff --git a/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java b/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java
index 18f4ee5..56c7c17 100644
--- a/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java
+++ b/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java
@@ -204,9 +204,7 @@ public boolean canExecuteTrade(@Nonnull UUID player, TradeGroup tg) {
 
         boolean enabled = tg.maxTrades == -1 || tradeCount < tg.maxTrades;
 
-        return availableTrades.getOrDefault(player, Collections.emptySet())
-            .contains(tg.getId()) && enabled
-            && cooldownRemaining < 0;
+        return getAvailableTradeGroups(player).contains(tg) && enabled && cooldownRemaining < 0;
     }
 
     public void executeTrade(@Nonnull UUID player, TradeGroup tg) {