diff --git a/block_entities/xplat/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/mixin/Mixin_BlockEntity.java b/block_entities/xplat/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/mixin/Mixin_BlockEntity.java
index ce73745..4a7c7e7 100644
--- a/block_entities/xplat/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/mixin/Mixin_BlockEntity.java
+++ b/block_entities/xplat/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/mixin/Mixin_BlockEntity.java
@@ -11,7 +11,6 @@ package lgbt.greenhouse.cowponents.block_entities.impl.mixin;
 import com.mojang.serialization.DataResult;
 import lgbt.greenhouse.cowponents.block_entities.api.v1.extension.CowponentsBlockEntityComponentHolder;
 import lgbt.greenhouse.cowponents.block_entities.impl.component.BlockEntityComponentInternals;
-import lgbt.greenhouse.cowponents.block_entities.impl.component.DefaultBlockEntityComponentsImpl;
 import lgbt.greenhouse.cowponents.extensions.impl.component.ComponentInheritanceInternals;
 import lgbt.greenhouse.cowponents.extensions.impl.duck.Duck_InheritableDataComponentMap;
 import lgbt.greenhouse.cowponents.impl.Cowponents;
@@ -124,14 +123,7 @@ public abstract class Mixin_BlockEntity implements CowponentsBlockEntityComponen
 
 	@Override
 	public @NonNull DataComponentMap cowponents$getPrototype() {
-		Holder<BlockEntityType<?>> holder = typeHolder();
-		var cowponentsOriginated = DefaultBlockEntityComponentsImpl.getCowponentsOriginatedComponents(holder);
-
-		if (cowponentsOriginated.isEmpty())
-			return DataComponentMap.EMPTY;
-
-		return typeHolder()
-				.components()
-				.filter(cowponentsOriginated::contains);
+		DataComponentMap map = typeHolder().components();
+		return map.isEmpty() ? DataComponentMap.EMPTY : map;
 	}
 }
diff --git a/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/mixin/Mixin_Entity.java b/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/mixin/Mixin_Entity.java
index 63a4450..5897fe3 100644
--- a/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/mixin/Mixin_Entity.java
+++ b/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/mixin/Mixin_Entity.java
@@ -201,15 +201,8 @@ public abstract class Mixin_Entity implements CowponentsEntityComponentHolder {
 
 	@Override
 	public @NonNull DataComponentMap cowponents$getPrototype() {
-		Holder<EntityType<?>> holder = typeHolder();
-		var cowponentsOriginated = DefaultEntityComponentsImpl.getCowponentsOriginatedComponents(holder);
-
-		if (cowponentsOriginated.isEmpty())
-			return DataComponentMap.EMPTY;
-
-		return typeHolder()
-				.components()
-				.filter(cowponentsOriginated::contains);
+		DataComponentMap map = typeHolder().components();
+		return map.isEmpty() ? DataComponentMap.EMPTY : map;
 	}
 
 	@Unique