diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 723bae6bfd..696a52ce2e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -451,7 +451,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public L2Npc doSpawn()
 	{
-		return doSpawn(false);
+		return _doRespawn ? doSpawn(false) : null;
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 723bae6bfd..696a52ce2e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -451,7 +451,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public L2Npc doSpawn()
 	{
-		return doSpawn(false);
+		return _doRespawn ? doSpawn(false) : null;
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 723bae6bfd..696a52ce2e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -451,7 +451,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public L2Npc doSpawn()
 	{
-		return doSpawn(false);
+		return _doRespawn ? doSpawn(false) : null;
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 723bae6bfd..696a52ce2e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -451,7 +451,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public L2Npc doSpawn()
 	{
-		return doSpawn(false);
+		return _doRespawn ? doSpawn(false) : null;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 2b3013ca04..8d76596e90 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -478,7 +478,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public L2Npc doSpawn()
 	{
-		return doSpawn(false);
+		return _doRespawn ? doSpawn(false) : null;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 723bae6bfd..696a52ce2e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -451,7 +451,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public L2Npc doSpawn()
 	{
-		return doSpawn(false);
+		return _doRespawn ? doSpawn(false) : null;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java
index 723bae6bfd..696a52ce2e 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java
@@ -451,7 +451,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 	
 	public L2Npc doSpawn()
 	{
-		return doSpawn(false);
+		return _doRespawn ? doSpawn(false) : null;
 	}
 	
 	/**