diff --git a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java
index 4e74601..f8f3dad 100644
--- a/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java
+++ b/UltimateStacker-API/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java
@@ -21,4 +21,6 @@ public interface EntityStack extends Stackable {
     void releaseHost();
 
     void destroy();
+
+    void updateNameTag();
 }
diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java
index d763913..1678da2 100644
--- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java
+++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java
@@ -50,7 +50,6 @@ public class EntityStackImpl implements EntityStack {
             this.amount = entity.getMetadata("US_AMOUNT").get(0).asInt();
         }
         this.hostEntity = entity;
-        updateNameTag();
     }
 
     /**
@@ -226,7 +225,7 @@ public class EntityStackImpl implements EntityStack {
         hostEntity = null;
     }
 
-    private void updateNameTag() {
+    public void updateNameTag() {
         if (hostEntity == null) {
             return;
         }
diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java
index 8d8477c..bd4acf8 100644
--- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java
+++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackManagerImpl.java
@@ -8,6 +8,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
+import uk.antiperson.stackmob.api.StackedEntity;
 
 import java.util.UUID;
 
@@ -21,7 +22,9 @@ public class EntityStackManagerImpl implements EntityStackManager {
 
     @Override
     public EntityStack createStackedEntity(LivingEntity entity, int amount) {
-        return new EntityStackImpl(entity, amount);
+        EntityStackImpl stackedEntity = new EntityStackImpl(entity, amount);
+        stackedEntity.updateNameTag();
+        return stackedEntity;
     }
 
     @Override
@@ -74,6 +77,7 @@ public class EntityStackManagerImpl implements EntityStackManager {
         EntityStack stack = getStackedEntity(oldEntity);
         if (stack == null) return null;
         EntityStack newStack = new EntityStackImpl(newEntity, takeOne ? stack.getAmount()-1 : stack.getAmount());
+        newStack.updateNameTag();
         stack.destroy();
         return newStack;
     }