diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
index 53c3bc765..e82d1d4c7 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
@@ -118,6 +118,7 @@ public class ActuallyAdditions {
 	        eventBus.addListener(this::clientSetup);
 	        eventBus.addListener(ActuallyAdditionsClient::setupSpecialRenders);
 	        eventBus.addListener(this::particleFactoryRegister);
+            eventBus.register(new ClientRegistryHandler());
         }
         IFarmerBehavior.initBehaviors();
     }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java
index 7c0390445..19ddbe148 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java
@@ -94,7 +94,6 @@ public class ActuallyAdditionsClient {
         MenuScreens.register(ActuallyContainers.XPSOLIDIFIER_CONTAINER.get(), GuiXPSolidifier::new);
         // From old proxy
         NeoForge.EVENT_BUS.register(new ClientEvents());
-        NeoForge.EVENT_BUS.register(new ClientRegistryHandler());
         NeoForge.EVENT_BUS.register(new SpecialRenderInit());
 
         event.enqueueWork(() ->