diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e5f9c5ffb0..3e40f76887 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 0163e4d618..0d537566a1 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 02708c8410..05af374536 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 0163e4d618..0d537566a1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 02708c8410..05af374536 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 0163e4d618..0d537566a1 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 02708c8410..05af374536 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index a99990b977..dbb14441c6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -632,6 +632,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 753455f02c..3d4eded097 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -588,6 +588,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index a99990b977..dbb14441c6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -632,6 +632,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 753455f02c..3d4eded097 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -588,6 +588,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 62dad07f78..0f0b5d2cf0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -650,6 +650,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 62dad07f78..0f0b5d2cf0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -650,6 +650,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 1408ede6ac..28850ef6bb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -614,6 +614,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 62dad07f78..0f0b5d2cf0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -650,6 +650,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 402284eef6..a09a0bb79f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -617,6 +617,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9c4415b6cf..94513b66a5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -665,6 +665,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 402284eef6..a09a0bb79f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -617,6 +617,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9c4415b6cf..94513b66a5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -665,6 +665,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 402284eef6..a09a0bb79f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -617,6 +617,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9c4415b6cf..94513b66a5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -665,6 +665,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index 2263bdf336..a80a3e9337 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -624,6 +624,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Drops are sorted by chance (high to low).
 							Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
 							for (DropHolder dropHolder : dropLists)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index d5c09a78d3..37738b327f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -649,6 +649,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index daff7eb562..205b5e56ae 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -620,6 +620,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Add LCoin drop for bosses.
 							if (type.contains("boss"))
 							{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e61f742bc0..173ee61113 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -664,6 +664,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index daff7eb562..205b5e56ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -620,6 +620,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Add LCoin drop for bosses.
 							if (type.contains("boss"))
 							{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e61f742bc0..173ee61113 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -664,6 +664,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java
index daff7eb562..205b5e56ae 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/NpcData.java
@@ -620,6 +620,8 @@ public class NpcData implements IXmlReader
 						
 						if (dropLists != null)
 						{
+							template.removeDrops();
+							
 							// Add LCoin drop for bosses.
 							if (type.contains("boss"))
 							{
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e61f742bc0..173ee61113 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -664,6 +664,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
 	}
 	
+	public void removeDrops()
+	{
+		_dropListDeath = null;
+		_dropListSpoil = null;
+	}
+	
 	public void addDrop(DropHolder dropHolder)
 	{
 		if (_dropListDeath == null)