diff --git a/src/main/java/by/dragonsurvivalteam/dragonsurvival/DragonSurvivalMod.java b/src/main/java/by/dragonsurvivalteam/dragonsurvival/DragonSurvivalMod.java
index f294217b96..5434e47030 100644
--- a/src/main/java/by/dragonsurvivalteam/dragonsurvival/DragonSurvivalMod.java
+++ b/src/main/java/by/dragonsurvivalteam/dragonsurvival/DragonSurvivalMod.java
@@ -89,7 +89,11 @@ public static ResourceLocation res(String name) {
 	public DragonSurvivalMod(IEventBus modEventBus, ModContainer modContainer){
 		if(FMLEnvironment.dist  == Dist.CLIENT){
 			GeckoLibClient.init();
+
+			// Register the configuration screen
+			modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
 		}
+
 		DragonTypes.registerTypes();
 		DragonBodies.registerBodies();
 
@@ -119,9 +123,6 @@ public DragonSurvivalMod(IEventBus modEventBus, ModContainer modContainer){
 		DS_STRUCTURE_PLACEMENT_TYPES.register(modEventBus);
 		DS_TRIGGERS.register(modEventBus);
 		GLM.register(modEventBus);
-
-		// Register the configuration screen
-		modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
 	}
 
 	private void commonSetup(final FMLCommonSetupEvent event){
diff --git a/src/main/java/by/dragonsurvivalteam/dragonsurvival/client/skin_editor_system/DragonEditorHandler.java b/src/main/java/by/dragonsurvivalteam/dragonsurvival/client/skin_editor_system/DragonEditorHandler.java
index eb11225963..5a69348089 100644
--- a/src/main/java/by/dragonsurvivalteam/dragonsurvival/client/skin_editor_system/DragonEditorHandler.java
+++ b/src/main/java/by/dragonsurvivalteam/dragonsurvival/client/skin_editor_system/DragonEditorHandler.java
@@ -34,13 +34,16 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Player;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.GlStateBackup;
 import net.neoforged.neoforge.client.event.RegisterShadersEvent;
 import org.jetbrains.annotations.Nullable;
 
-@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
+@OnlyIn(Dist.CLIENT)
+@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class DragonEditorHandler{
 	private static ShaderInstance skinGenerationShader;