diff --git a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java
index 8577598..fbd4b1d 100644
--- a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java
+++ b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricClientMod.java
@@ -45,7 +45,7 @@ public class CarryOnFabricClientMod implements ClientModInitializer
 	{
 		CarryOnKeybinds.registerKeybinds(KeyBindingHelper::registerKeyBinding);
 		ClientEvents.registerEvents();
-		CarryOnCommon.registerClientPackets();
+		CarryOnCommon.registerClientPackets(true);
 	}
 
 	public static void sendPacketToServer(PacketBase packet)
diff --git a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java
index 14a5d49..9cbb4cc 100644
--- a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java
+++ b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java
@@ -45,6 +45,7 @@ public class CarryOnFabricMod implements ModInitializer {
 
         CommonEvents.registerEvents();
         CarryOnCommon.registerServerPackets();
+        CarryOnCommon.registerClientPackets(false);
 
     }
 }
diff --git a/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java b/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java
index 8ea3894..020ac7d 100644
--- a/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java
+++ b/Fabric/src/main/java/tschipp/carryon/platform/FabricPlatformHelper.java
@@ -82,9 +82,12 @@ public class FabricPlatformHelper implements IPlatformHelper {
     @Override
     public <T extends PacketBase, B extends FriendlyByteBuf> void  registerClientboundPacket(CustomPacketPayload.Type<T> type, Class<T> clazz, StreamCodec<B, T> codec, BiConsumer<T, Player> handler, Object... args)
     {
-        PayloadTypeRegistry.playS2C().register(type, (StreamCodec<RegistryFriendlyByteBuf, T>)codec);
+        boolean client = (boolean)args[0];
 
-        CarryOnFabricClientMod.registerClientboundPacket(type, handler);
+        if(!client)
+            PayloadTypeRegistry.playS2C().register(type, (StreamCodec<RegistryFriendlyByteBuf, T>)codec);
+        else
+            CarryOnFabricClientMod.registerClientboundPacket(type, handler);
     }
 
     @Override