diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 9efabd0f50..48097a78dc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -88,11 +88,13 @@ public class OlympiadStadium
 	
 	public final void spawnBuffers()
 	{
+		_buffers.forEach(L2Spawn::startRespawn);
 		_buffers.forEach(L2Spawn::doSpawn);
 	}
 	
 	public final void deleteBuffers()
 	{
+		_buffers.forEach(L2Spawn::stopRespawn);
 		_buffers.stream().map(L2Spawn::getLastSpawn).filter(Objects::nonNull).forEach(L2Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 9efabd0f50..48097a78dc 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -88,11 +88,13 @@ public class OlympiadStadium
 	
 	public final void spawnBuffers()
 	{
+		_buffers.forEach(L2Spawn::startRespawn);
 		_buffers.forEach(L2Spawn::doSpawn);
 	}
 	
 	public final void deleteBuffers()
 	{
+		_buffers.forEach(L2Spawn::stopRespawn);
 		_buffers.stream().map(L2Spawn::getLastSpawn).filter(Objects::nonNull).forEach(L2Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 9efabd0f50..48097a78dc 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -88,11 +88,13 @@ public class OlympiadStadium
 	
 	public final void spawnBuffers()
 	{
+		_buffers.forEach(L2Spawn::startRespawn);
 		_buffers.forEach(L2Spawn::doSpawn);
 	}
 	
 	public final void deleteBuffers()
 	{
+		_buffers.forEach(L2Spawn::stopRespawn);
 		_buffers.stream().map(L2Spawn::getLastSpawn).filter(Objects::nonNull).forEach(L2Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 9efabd0f50..48097a78dc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -88,11 +88,13 @@ public class OlympiadStadium
 	
 	public final void spawnBuffers()
 	{
+		_buffers.forEach(L2Spawn::startRespawn);
 		_buffers.forEach(L2Spawn::doSpawn);
 	}
 	
 	public final void deleteBuffers()
 	{
+		_buffers.forEach(L2Spawn::stopRespawn);
 		_buffers.stream().map(L2Spawn::getLastSpawn).filter(Objects::nonNull).forEach(L2Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 9efabd0f50..48097a78dc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -88,11 +88,13 @@ public class OlympiadStadium
 	
 	public final void spawnBuffers()
 	{
+		_buffers.forEach(L2Spawn::startRespawn);
 		_buffers.forEach(L2Spawn::doSpawn);
 	}
 	
 	public final void deleteBuffers()
 	{
+		_buffers.forEach(L2Spawn::stopRespawn);
 		_buffers.stream().map(L2Spawn::getLastSpawn).filter(Objects::nonNull).forEach(L2Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 9efabd0f50..48097a78dc 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -88,11 +88,13 @@ public class OlympiadStadium
 	
 	public final void spawnBuffers()
 	{
+		_buffers.forEach(L2Spawn::startRespawn);
 		_buffers.forEach(L2Spawn::doSpawn);
 	}
 	
 	public final void deleteBuffers()
 	{
+		_buffers.forEach(L2Spawn::stopRespawn);
 		_buffers.stream().map(L2Spawn::getLastSpawn).filter(Objects::nonNull).forEach(L2Npc::deleteMe);
 	}