diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java
index 5baacec80..0b571264e 100755
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -21,6 +21,7 @@ import baritone.api.event.GameEventHandler;
 import baritone.behavior.Behavior;
 import baritone.behavior.impl.*;
 import baritone.utils.InputOverrideHandler;
+import baritone.utils.ToolSet;
 import net.minecraft.client.Minecraft;
 
 import java.io.File;
@@ -81,6 +82,7 @@ public enum Baritone {
             registerBehavior(LocationTrackingBehavior.INSTANCE);
             registerBehavior(FollowBehavior.INSTANCE);
             registerBehavior(MineBehavior.INSTANCE);
+            this.gameEventHandler.registerEventListener(ToolSet.INTERNAL_EVENT_LISTENER);
         }
         this.dir = new File(Minecraft.getMinecraft().gameDir, "baritone");
         if (!Files.exists(dir.toPath())) {
diff --git a/src/main/java/baritone/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java
index 415d8ebdd..ce24b7087 100644
--- a/src/main/java/baritone/utils/ToolSet.java
+++ b/src/main/java/baritone/utils/ToolSet.java
@@ -17,7 +17,6 @@
 
 package baritone.utils;
 
-import baritone.Baritone;
 import baritone.api.event.events.ItemSlotEvent;
 import baritone.api.event.listener.AbstractGameEventListener;
 import net.minecraft.block.Block;
@@ -46,11 +45,7 @@ public class ToolSet implements Helper {
     /**
      * Instance of the internal event listener used to hook into Baritone's event bus
      */
-    private static final InternalEventListener INTERNAL_EVENT_LISTENER = new InternalEventListener();
-
-    static {
-        Baritone.INSTANCE.getGameEventHandler().registerEventListener(INTERNAL_EVENT_LISTENER);
-    }
+    public static final InternalEventListener INTERNAL_EVENT_LISTENER = new InternalEventListener();
 
     /**
      * A list of tools on the hotbar that should be considered.