diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/RaceChangeStatusEffect.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/RaceChangeStatusEffect.java
index 575b3c3c..00c831df 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/effect/RaceChangeStatusEffect.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/RaceChangeStatusEffect.java
@@ -112,7 +112,11 @@ public class RaceChangeStatusEffect extends StatusEffect {
                 magic.getExertion().set(0);
 
                 if (!pony.asEntity().isCreative()) {
-                    entity.damage(Living.living(entity).damageOf(UDamageTypes.TRIBE_SWAP), Float.MAX_VALUE);
+                    if (!entity.damage(Living.living(entity).damageOf(UDamageTypes.TRIBE_SWAP), Float.MAX_VALUE)) {
+                        entity.setHealth(0);
+                        pony.setRespawnRace(Race.UNSET);
+                        pony.setSpecies(race);
+                    }
                 }
             } else {
                 eq.setSpecies(race);