diff --git a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java
index cf9947b..933dbfa 100644
--- a/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java
+++ b/Fabric/src/main/java/tschipp/carryon/CarryOnFabricMod.java
@@ -38,7 +38,7 @@ public class CarryOnFabricMod implements ModInitializer {
             builder -> builder
                     .initializer(() -> new CarryOnData(new CompoundTag()))
                     .persistent(CarryOnData.CODEC)
-                    .syncWith(CarryOnData.STREAM_CODEC, (t, p) -> p.connection != null)
+                    .syncWith(CarryOnData.STREAM_CODEC, (t, p) -> p.connection != null && !p.isRemoved())
                     .copyOnDeath()
 
     );