diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
index c9549be..19ecd98 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
@@ -90,15 +90,15 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
 
         if (nametags.contains(name.toLowerCase())) {
             if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
+                VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
+                VillagerOptimizer.callEvent(optimizeEvent);
+                if (optimizeEvent.isCancelled()) return;
+
                 if (!consumeNametag) {
                     event.setCancelled(true);
                     villager.customName(newVillagerName);
                 }
 
-                VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
-                VillagerOptimizer.callEvent(optimizeEvent);
-                if (optimizeEvent.isCancelled()) return;
-
                 wVillager.setOptimization(optimizeEvent.getOptimizationType());
                 wVillager.saveOptimizeTime();
 
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
index e27d967..32caff6 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimizations/OptimizeByNametag.java
@@ -90,15 +90,15 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
 
         if (nametags.contains(name.toLowerCase())) {
             if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
+                VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
+                VillagerOptimizer.callEvent(optimizeEvent);
+                if (optimizeEvent.isCancelled()) return;
+
                 if (!consumeNametag) {
                     event.setCancelled(true);
                     villager.customName(newVillagerName);
                 }
 
-                VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, event.isAsynchronous());
-                VillagerOptimizer.callEvent(optimizeEvent);
-                if (optimizeEvent.isCancelled()) return;
-
                 wVillager.setOptimization(optimizeEvent.getOptimizationType());
                 wVillager.saveOptimizeTime();