diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java
index 70c7a7cd6..03f228372 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java
@@ -232,6 +232,7 @@ public class RabbitController extends MobEntityController {
                     initPathfinder(); // make sure the evil goals include the default AI goals
                 }
                 super.setRabbitType(type);
+                NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             } else if (NMSImpl.getRabbitTypeField() != null) {
                 datawatcher.set(NMSImpl.getRabbitTypeField(), type);
             }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java
index 9ca03a1fc..9d92100a2 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java
@@ -232,6 +232,7 @@ public class RabbitController extends MobEntityController {
                     initPathfinder(); // make sure the evil goals include the default AI goals
                 }
                 super.setRabbitType(type);
+                NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             } else if (NMSImpl.getRabbitTypeField() != null) {
                 datawatcher.set(NMSImpl.getRabbitTypeField(), type);
             }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java
index 03b618eec..5fe36335a 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java
@@ -232,6 +232,7 @@ public class RabbitController extends MobEntityController {
                     initPathfinder(); // make sure the evil goals include the default AI goals
                 }
                 super.setRabbitType(type);
+                NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             } else if (NMSImpl.getRabbitTypeField() != null) {
                 datawatcher.set(NMSImpl.getRabbitTypeField(), type);
             }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java
index 12863a104..06be4d716 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java
@@ -216,6 +216,7 @@ public class RabbitController extends MobEntityController {
                     registerGoals(); // make sure the evil goals include the default AI goals
                 }
                 super.setRabbitType(type);
+                NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             } else if (NMSImpl.getRabbitTypeField() != null) {
                 entityData.set(NMSImpl.getRabbitTypeField(), type);
             }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java
index c2ce5ab9f..d8d4b2aa8 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java
@@ -217,6 +217,7 @@ public class RabbitController extends MobEntityController {
                     registerGoals(); // make sure the evil goals include the default AI goals
                 }
                 super.setRabbitType(type);
+                NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             } else if (NMSImpl.getRabbitTypeField() != null) {
                 entityData.set(NMSImpl.getRabbitTypeField(), type);
             }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java
index 1a1111d12..b41ccb214 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java
@@ -218,6 +218,7 @@ public class RabbitController extends MobEntityController {
                     registerGoals(); // make sure the evil goals include the default AI goals
                 }
                 super.setVariant(variant);
+                NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             } else if (NMSImpl.getRabbitTypeField() != null) {
                 entityData.set(NMSImpl.getRabbitTypeField(), variant.id());
             }
diff --git a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java
index 2816d1e7e..e782d8df8 100644
--- a/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java
+++ b/v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/RabbitController.java
@@ -208,6 +208,7 @@ public class RabbitController extends MobEntityController {
                     registerGoals(); // make sure the evil goals include the default AI goals
                 }
                 super.setVariant(variant);
+                NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             } else if (NMSImpl.RABBIT_TYPE_DATAWATCHER != null) {
                 entityData.set(NMSImpl.RABBIT_TYPE_DATAWATCHER, variant.id());
             }