diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/ChristmasTree.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/ChristmasTree.java
index ddbecd6ea9bb3c3ec6ef2c053d995c27e2e1cf6f..d899446cd3c861770679f12799e31f1d2ee89651 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/ChristmasTree.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/NpcBuffers/ChristmasTree.java
@@ -79,13 +79,14 @@ public class ChristmasTree extends AbstractNpcAI
 			{
 				L2Skill skill = _holder.getSkill();
 				
-				final L2PcInstance player = _npc.getSummoner().getActingPlayer();
-				if (player == null)
+				if (_npc.getSummoner() == null || !_npc.getSummoner().isPlayer())
 				{
 					ThreadPoolManager.getInstance().scheduleGeneral(this, 1000);
 					return;
 				}
 				
+				final L2PcInstance player = _npc.getSummoner().getActingPlayer();
+				
 				if (!player.isInParty())
 				{
 					if (player.isInsideRadius(_npc, skill.getSkillRadius(), true, true))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
index a7e51dfd56229e614c893d1717277db30ead238c..87be8d9ac2d959dbf8eaa7de31d6681debff0c69 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ChristmasTree.java
@@ -18,6 +18,7 @@ import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
@@ -62,7 +63,8 @@ public class ChristmasTree implements IItemHandler
 			spawn.setLocy(target.getY());
 			spawn.setLocz(target.getZ());
 			spawn.setInstanceId(activeChar.getInstanceId());
-			spawn.spawnOne(false);
+			L2Npc npc = spawn.spawnOne(false);
+			npc.setSummoner(activeChar);
 			
 			activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false);
 			
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
index 50bb715c5cb22bfa71fa11d0966abcd889a706d1..9aa08875ff89a13283d707eef225fa2d9600e3a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java
@@ -122,6 +122,7 @@ public class SummonItems implements IItemHandler
 						spawn.setInstanceId(activeChar.getInstanceId());
 						spawn.stopRespawn();
 						final L2Npc npc = spawn.spawnOne(true);
+						npc.setSummoner(activeChar);
 						npc.setTitle(activeChar.getName());
 						npc.setIsRunning(false); // broadcast info
 						if (sitem.getDespawnDelay() > 0)