diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
index 04520be3ee..8fb8629bc0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
@@ -52,6 +52,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
 
     public void setTamed(boolean tame) {
         getHandle().setTamed(tame);
+        if (!tame) {
+            setOwnerName("");
+        }
     }
 
     public boolean isSitting() {