Best way of fixing issues when serializing component entities is not serializing component entities

Best way of fixing issues when serializing component entities is not serializing component entities

Closes #3554207