diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
index 4d1822cb..2e87ae8e 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
@@ -451,6 +451,16 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
     @Override
     public void tick() {
         super.tick();
+
+        Race currentRace = getActualSpecies();
+        if (!currentRace.isUnset()) {
+            Race newRace = currentRace.validate(entity);
+
+            if (newRace != currentRace) {
+                setSpecies(newRace);
+            }
+        }
+
         sendCapabilities();
     }