diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java
index caf86c7b5..8bffc14de 100644
--- a/src/main/java/noppes/npcs/CustomNpcs.java
+++ b/src/main/java/noppes/npcs/CustomNpcs.java
@@ -338,6 +338,7 @@ public class CustomNpcs {
             clientJaninoCompiler = null;
 
         Server = event.getServer();
+        AnimationController.Instance.load();
         ChunkController.Instance.clear();
         FactionController.getInstance().load();
         MagicController.getInstance().load();
diff --git a/src/main/java/noppes/npcs/controllers/AnimationController.java b/src/main/java/noppes/npcs/controllers/AnimationController.java
index b4203b452..5fc310c91 100644
--- a/src/main/java/noppes/npcs/controllers/AnimationController.java
+++ b/src/main/java/noppes/npcs/controllers/AnimationController.java
@@ -45,14 +45,13 @@ public class AnimationController implements IAnimationHandler {
     private static final String BUILTIN_ANIMATIONS_PATH = "/assets/customnpcs/animations";
     private static final String BUILTIN_ANIMATIONS_RESOURCE = "assets/customnpcs/animations";
 
-    public static AnimationController Instance;
+    public static AnimationController Instance = new AnimationController();
     private int lastUsedID = 0;
 
     public AnimationController() {
         Instance = this;
         bootOrder = new HashMap<>();
         animations = new HashMap<>();
-        load();
     }
 
     public static AnimationController getInstance() {