diff --git a/Content.Server/Traits/TraitSystem.Functions.cs b/Content.Server/Traits/TraitSystem.Functions.cs
index 528cb4f9183..07794903d3e 100644
--- a/Content.Server/Traits/TraitSystem.Functions.cs
+++ b/Content.Server/Traits/TraitSystem.Functions.cs
@@ -74,7 +74,7 @@ public override void OnPlayerSpawn(EntityUid uid,
         ISerializationManager serializationManager)
     {
         foreach (var (name, _) in Components)
-            entityManager.RemoveComponent(uid, (Component) factory.GetComponent(name));
+            entityManager.RemoveComponentDeferred(uid, factory.GetComponent(name).GetType());
     }
 }