diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/ServerListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/ServerListener.java
index 953ca0da..c31f42c1 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/ServerListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/ServerListener.java
@@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.listener;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import me.lojosho.hibiscuscommons.api.events.HibiscusHookReload;
+import me.lojosho.hibiscuscommons.api.events.HibiscusHooksAllActiveEvent;
 import me.lojosho.hibiscuscommons.hooks.Hook;
 import me.lojosho.hibiscuscommons.hooks.items.HookItemAdder;
 import me.lojosho.hibiscuscommons.hooks.items.HookNexo;
@@ -15,27 +16,23 @@ public class ServerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onHookReload(HibiscusHookReload event) {
         Hook hook = event.getHook();
+        HibiscusHookReload.ReloadType reloadType = event.getReloadType();
         if (hook instanceof HookItemAdder) {
-            switch (event.getReloadType()) {
-                case INITIAL -> {
-                    HMCCosmeticsPlugin.setup();
-                }
-                case RELOAD -> {
-                    if (!Settings.isItemsAdderChangeReload()) return;
-                    HMCCosmeticsPlugin.setup();
-                }
+            if (reloadType == HibiscusHookReload.ReloadType.RELOAD) {
+                if (!Settings.isItemsAdderChangeReload()) return;
+                HMCCosmeticsPlugin.setup();
             }
         }
         if (hook instanceof HookNexo) {
-            switch (event.getReloadType()) {
-                case INITIAL -> {
-                    HMCCosmeticsPlugin.setup();
-                }
-                case RELOAD -> {
-                    if (!Settings.isNexoChangeReload()) return;
-                    HMCCosmeticsPlugin.setup();
-                }
+            if (reloadType == HibiscusHookReload.ReloadType.RELOAD) {
+                if (!Settings.isNexoChangeReload()) return;
+                HMCCosmeticsPlugin.setup();
             }
         }
     }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onAllHooksReady(HibiscusHooksAllActiveEvent event) {
+        HMCCosmeticsPlugin.setup();
+    }
 }