diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
index c29b82c..48d68fd 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
@@ -53,15 +53,9 @@ public class RenameOptimized implements VillagerOptimizerModule, Listener {
         Villager villager = wVillager.villager();
 
         plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> {
-            if (overwrite_previous_name) {
+            if (overwrite_previous_name || villager.customName() == null) {
                 villager.customName(optimized_name);
                 wVillager.memorizeName(optimized_name);
-            } else {
-                final Component currentName = villager.customName();
-                if (currentName == null) {
-                    villager.customName(optimized_name);
-                    wVillager.memorizeName(optimized_name);
-                }
             }
         }, 10L);
     }
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
index 9aef0d4..07f837c 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/RenameOptimized.java
@@ -53,15 +53,9 @@ public class RenameOptimized implements VillagerOptimizerModule, Listener {
         Villager villager = wVillager.villager();
 
         villager.getScheduler().runDelayed(plugin, nameOptimized -> {
-            if (overwrite_previous_name) {
+            if (overwrite_previous_name || villager.customName() == null) {
                 villager.customName(optimized_name);
                 wVillager.memorizeName(optimized_name);
-            } else {
-                final Component currentName = villager.customName();
-                if (currentName == null) {
-                    villager.customName(optimized_name);
-                    wVillager.memorizeName(optimized_name);
-                }
             }
         }, null, 10L);
     }