diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/misc/AutoSpawner.java b/src/main/java/me/zeroeightsix/kami/module/modules/misc/AutoSpawner.java
index 838b1c5b..b41ce8e7 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/misc/AutoSpawner.java
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/misc/AutoSpawner.java
@@ -42,7 +42,7 @@ public class AutoSpawner extends Module {
     private Setting<Boolean> party = register(Settings.b("Party", false));
     private Setting<Boolean> partyWithers = register(Settings.booleanBuilder("Withers").withValue(false).withVisibility(v -> party.getValue()).build());
     private Setting<EntityMode> entityMode = register(Settings.enumBuilder(EntityMode.class).withName("Entity Mode").withValue(EntityMode.SNOW).withVisibility(v -> !party.getValue()).build());
-    private Setting<Boolean> nametagWithers = register(Settings.booleanBuilder("Nametag").withValue(true).withVisibility(v -> (party.getValue() && partyWithers.getValue()) || entityMode.getValue().equals(EntityMode.WITHER)).build());
+    private Setting<Boolean> nametagWithers = register(Settings.booleanBuilder("Nametag").withValue(true).withVisibility(v -> party.getValue() && partyWithers.getValue() || !party.getValue() && entityMode.getValue().equals(EntityMode.WITHER)).build());
     private Setting<Float> placeRange = register(Settings.floatBuilder("Place Range").withMinimum(2.0f).withValue(3.5f).withMaximum(10.0f).build());
     private Setting<Integer> delay = register(Settings.integerBuilder("Delay").withMinimum(12).withValue(20).withMaximum(100).withVisibility(v -> useMode.getValue().equals(UseMode.SPAM)).build());
     private Setting<Boolean> rotate = register(Settings.b("Rotate", true));
@@ -356,7 +356,7 @@ public class AutoSpawner extends Module {
     public void onUpdate() {
         if (mc.player == null) return;
 
-        if (nametagWithers.getValue()) useNameTag();
+        if (nametagWithers.getValue() && (party.getValue() && partyWithers.getValue() || !party.getValue() && entityMode.getValue().equals(EntityMode.WITHER))) useNameTag();
 
         if (buildStage == 1) {
             isSneaking = false;