diff --git a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
index fa38f7e87..1829427ab 100644
--- a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
@@ -53,8 +53,8 @@ public boolean isEnabled() {
     }
 
     @Override
-    public void onAttach() {
-        flock = new Flocker(npc, new RadiusNPCFlock(4, 20), new SeparationBehavior(1));
+    public void onDespawn() {
+        flock = null;
     }
 
     @EventHandler
@@ -71,6 +71,11 @@ private void onEntityDamage(EntityDamageByEntityEvent event) {
         }
     }
 
+    @Override
+    public void onSpawn() {
+        flock = new Flocker(npc, new RadiusNPCFlock(4, 0), new SeparationBehavior(1));
+    }
+
     @Override
     public void run() {
         if (player == null || !player.isValid()) {