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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 b9492fa918..fce5c99f5d 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 e17db080cb..9edff93e6e 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 e17db080cb..9edff93e6e 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e17db080cb..9edff93e6e 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index e17db080cb..9edff93e6e 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 9125ef09a7..d52f36d6dd 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
@@ -785,7 +785,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 9125ef09a7..d52f36d6dd 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
@@ -785,7 +785,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 66af22e7aa..e4be0a78ce 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
@@ -847,7 +847,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 66af22e7aa..e4be0a78ce 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
@@ -847,7 +847,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 66af22e7aa..e4be0a78ce 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
@@ -847,7 +847,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 5252226bbf..41373c82fc 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
@@ -862,7 +862,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 5252226bbf..41373c82fc 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
@@ -862,7 +862,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 5252226bbf..41373c82fc 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
@@ -862,7 +862,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 0f5a582a78..1d3e86b4d9 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
@@ -846,7 +846,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 cf067f42b6..2ef83fc7f4 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
@@ -861,7 +861,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
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 cf067f42b6..2ef83fc7f4 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
@@ -861,7 +861,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index cf067f42b6..2ef83fc7f4 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -861,7 +861,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index cf067f42b6..2ef83fc7f4 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -861,7 +861,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 					}
 					
 					// skip zero chance drops
-					if ((Config.RATE_DROP_CHANCE_BY_ID.getOrDefault(dropItem.getItemId(), 0f) <= 0))
+					final Float itemChance = Config.RATE_DROP_CHANCE_BY_ID.get(dropItem.getItemId());
+					if ((itemChance != null) && (itemChance <= 0))
 					{
 						continue;
 					}