diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java
index 0427d9dd4..7a23a6b45 100644
--- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java
+++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java
@@ -8,7 +8,6 @@ import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.addon.annotations.Addon;
 import com.dfsek.terra.api.addon.annotations.Author;
 import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
@@ -20,7 +19,7 @@ import java.util.function.Supplier;
 @Addon("config-locators")
 @Version("1.0.0")
 @Author("Terra")
-public class LocatorAddon extends TerraAddon implements EventListener {
+public class LocatorAddon extends TerraAddon {
 
     public static final TypeKey<Supplier<ObjectTemplate<Locator>>> LOCATOR_TOKEN = new TypeKey<>() {};
     @Inject
@@ -28,12 +27,12 @@ public class LocatorAddon extends TerraAddon implements EventListener {
 
     @Override
     public void initialize() {
-        main.getEventManager().registerListener(this, this);
-    }
-
-    public void onPackLoad(ConfigPackPreLoadEvent event) {
-        CheckedRegistry<Supplier<ObjectTemplate<Locator>>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN);
-        locatorRegistry.register("SURFACE", () -> new SurfaceLocatorTemplate(main));
-        locatorRegistry.register("RANDOM", RandomLocatorTemplate::new);
+        main.getEventManager()
+                .register(ConfigPackPreLoadEvent.class)
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<Locator>>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN);
+                    locatorRegistry.register("SURFACE", () -> new SurfaceLocatorTemplate(main));
+                    locatorRegistry.register("RANDOM", RandomLocatorTemplate::new);
+                });
     }
 }